]> git.baikalelectronics.ru Git - kernel.git/commit
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Feb 2011 22:03:41 +0000 (17:03 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Feb 2011 22:03:41 +0000 (17:03 -0500)
commit46fbf3264d4ba235d0378046cff1bedd511abef7
treee45a0e41c91a1d199fd865b011ed0d25f5497bb9
parent0ad7c6125968d543ed55e2a15612b4e96c71a576
parent173e890a9e4bd78c32b0047a126b5e8fea669ce2
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c
18 files changed:
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/rt2x00/rt2800pci.c
drivers/net/wireless/wl1251/main.c
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c
net/mac80211/status.c
net/mac80211/tx.c
net/mac80211/util.c