]> 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, 16 May 2011 18:55:42 +0000 (14:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 16 May 2011 23:32:19 +0000 (19:32 -0400)
commit762848fa248ede009986f9739cf5dfc0bcc1fa6d
treeef583ab8ac09bf703026650d4bc7777e6a3864d3
parent16c709ab1db3f0985a1c361a870e8b5f05d7581c
parent3200b923c2ff3765a9b817a035764ee65ac8a347
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/mac80211/sta_info.h
24 files changed:
MAINTAINERS
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/mwifiex/main.c
drivers/net/wireless/rt2x00/rt2800.h
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2x00usb.c
drivers/net/wireless/wl12xx/cmd.c
drivers/net/wireless/wl12xx/conf.h
include/linux/nl80211.h
include/net/mac80211.h
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/mac80211/ieee80211_i.h
net/mac80211/iface.c
net/mac80211/mesh_pathtbl.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/rx.c
net/mac80211/sta_info.c
net/wireless/reg.c