]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite54ea873b4b2cd800f86dc4e7e1d93debb6b889b
treec5547580ee6d47d01735124c6bd8ba1dfb70e206
parent5d5acf7f3e8c669857f1288b923731e4b4ceb550
parenta08310dc3013eff5f5372b94eff3f003a6b9a86c
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