Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorJohannes Berg <johannes.berg@intel.com>
Tue, 12 Feb 2013 15:52:04 +0000 (16:52 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 12 Feb 2013 15:52:11 +0000 (16:52 +0100)

Trivial merge