Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorJohannes Berg <johannes.berg@intel.com>
Tue, 26 Mar 2013 09:35:50 +0000 (10:35 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 26 Mar 2013 09:35:50 +0000 (10:35 +0100)

Trivial merge