Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorJohannes Berg <johannes.berg@intel.com>
Wed, 30 Jan 2013 20:39:54 +0000 (21:39 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 30 Jan 2013 20:39:54 +0000 (21:39 +0100)

Trivial merge