]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Feb 2012 19:26:39 +0000 (14:26 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Feb 2012 19:26:39 +0000 (14:26 -0500)
commitcd158ca9030a61b4a65dac1d6f3c86aa68a7a7d7
tree0c02c3cfff77e868d605246204add4664503b2af
parent973290c65acc08da5b5049b3773b27eb231b5f7b
parent3c619503ba60e34ff5c32a06a0ac7fb72019e929
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/rtlwifi/rtl8192se/sw.c
15 files changed:
MAINTAINERS
drivers/net/wireless/b43/main.c
drivers/net/wireless/brcm80211/brcmsmac/main.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rtlwifi/rtl8192se/sw.c
net/mac80211/ibss.c
net/mac80211/iface.c
net/mac80211/mesh_hwmp.c
net/mac80211/mesh_plink.c
net/mac80211/mlme.c
net/mac80211/rx.c