Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Apr 2011 19:39:10 +0000 (15:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Apr 2011 19:39:10 +0000 (15:39 -0400)
commit429576b97c623b9c4e3375fb7c37bce377f51e68
treedc4fd40ae54d177ddb3cb3991e8c3ff019eef238
parent9835a30e980561082beb02ce724f6e555787bc19
parent069f40fc07f6df3da325e7ea1698a0d6247983d5
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
13 files changed:
drivers/net/wireless/ath/ath9k/hif_usb.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/mac.c
drivers/net/wireless/ath/ath9k/mac.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/iwlegacy/iwl4965-base.c
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c
net/mac80211/cfg.c