Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorJohannes Berg <johannes.berg@intel.com>
Mon, 18 Feb 2013 19:16:12 +0000 (20:16 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 18 Feb 2013 19:16:12 +0000 (20:16 +0100)

Trivial merge