]> 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)
commit1b70c663c4505b7aa238ab1559fc0e9393b28051
treec5547580ee6d47d01735124c6bd8ba1dfb70e206
parent1550423bbae002d3be1ebdba2fe7b0d0e8ade01e
parent664e8e5ddc00598b2ec50b7d1f6606686a06ffd4
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