Merge remote-tracking branch 'mac80211/master' into HEAD
authorJohannes Berg <johannes.berg@intel.com>
Fri, 15 Feb 2013 08:41:21 +0000 (09:41 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 15 Feb 2013 08:41:21 +0000 (09:41 +0100)

Trivial merge