Merge remote-tracking branch 'wireless-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Mon, 16 Dec 2013 10:23:45 +0000 (11:23 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 16 Dec 2013 10:23:45 +0000 (11:23 +0100)

Trivial merge