Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Jun 2012 16:07:37 +0000 (12:07 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Jun 2012 16:07:37 +0000 (12:07 -0400)
commit42fb0b0278e6b9a44bee8adec051de5f43e10b2b
treef53513819d11445385346cf75be05054dae3438d
parent34202e28fe7fc8551313f9a035a8857db83de757
parentc9015b24b262bc7ea56cfd5d78983a73fb5ebd7d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
15 files changed:
drivers/bluetooth/btmrvl_sdio.c
drivers/bluetooth/btusb.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/htc_drv_main.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/iwlwifi/dvm/debugfs.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/ie.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/mac80211/mlme.c
net/mac80211/rx.c