Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorJohannes Berg <johannes.berg@intel.com>
Wed, 13 Jun 2012 07:01:22 +0000 (09:01 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 13 Jun 2012 07:01:28 +0000 (09:01 +0200)

Trivial merge