Merge remote-tracking branch 'mac80211/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Fri, 24 May 2013 22:01:30 +0000 (00:01 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 24 May 2013 22:01:30 +0000 (00:01 +0200)

Trivial merge