Merge remote-tracking branch 'wireless-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Thu, 28 Jun 2012 11:45:58 +0000 (13:45 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 28 Jun 2012 11:45:58 +0000 (13:45 +0200)

Trivial merge