Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorJohannes Berg <johannes.berg@intel.com>
Wed, 5 Sep 2012 14:17:42 +0000 (16:17 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 5 Sep 2012 14:17:42 +0000 (16:17 +0200)

Trivial merge