Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 3 Jan 2012 20:16:34 +0000 (15:16 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 3 Jan 2012 20:16:34 +0000 (15:16 -0500)
commit57adc1fcbae2c13104ce291b40f23e40a414fa87
treea22d95cd3a96cbd515cd24fb0833739576c5e92f
parentfaa85aa24286a9e14ae7cc797352350c3ac39986
parentdc0d633e35643662f27a0b1c531da3cd6b204b9c
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/b43/dma.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
18 files changed:
drivers/net/wireless/ath/ath6kl/init.c
drivers/net/wireless/ath/ath9k/eeprom_def.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/b43/dma.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
drivers/net/wireless/mwl8k.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rtlwifi/base.c
drivers/net/wireless/rtlwifi/wifi.h
include/net/bluetooth/l2cap.h
net/bluetooth/hci_event.c
net/bluetooth/hci_sock.c
net/bluetooth/l2cap_core.c
net/bluetooth/rfcomm/core.c
net/bluetooth/sco.c