Merge remote-tracking branch 'mac80211/master' into HEAD
authorJohannes Berg <johannes.berg@intel.com>
Wed, 6 Mar 2013 15:33:12 +0000 (16:33 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 6 Mar 2013 15:33:12 +0000 (16:33 +0100)
commitc0f3a317f2f0e51ad2f8809c83b137958b385c7f
treec5547580ee6d47d01735124c6bd8ba1dfb70e206
parent6dbe51c251a327e012439c4772097a13df43c5b8
parent801d929ca7d935ee199fd61d8ef914f51e892270
Merge remote-tracking branch 'mac80211/master' into HEAD

There are a few things that would otherwise conflict.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/tx.c
net/wireless/core.c