From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 11 Feb 2013 17:44:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'wireless-next/master' into HEAD
X-Git-Tag: v3.9-rc1~139^2~31^2^2~12^2~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=78f42aee884dedfd157f79d01f069550edbc95cf;p=users%2Fdwmw2%2Flinux.git

Merge remote-tracking branch 'wireless-next/master' into HEAD
---

78f42aee884dedfd157f79d01f069550edbc95cf