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)
commitb67afe7f43afd2f5cd98798993561920c1684c12
treee45a0e41c91a1d199fd865b011ed0d25f5497bb9
parentdb28569adc692d9fb8a2d2d8e7ebab7fd5481f10
parent28bec7b845e10b68e6ba1ade5de0fc566690fc61
Merge ssh:///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