Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorJohannes Berg <johannes.berg@intel.com>
Wed, 29 May 2013 19:56:46 +0000 (21:56 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 29 May 2013 19:56:46 +0000 (21:56 +0200)

Trivial merge