Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorJohannes Berg <johannes.berg@intel.com>
Tue, 11 Jun 2013 18:16:44 +0000 (20:16 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 11 Jun 2013 18:16:44 +0000 (20:16 +0200)

Trivial merge