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

Trivial merge