Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Jul 2012 20:34:34 +0000 (16:34 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Jul 2012 20:34:34 +0000 (16:34 -0400)
commit635d999fd3b9f0ddc899eaf45fc49bec65c0b8e2
tree0456542caa85aff0f4edf91707e36850f76d585f
parent34202e28fe7fc8551313f9a035a8857db83de757
parentb48d96652626b315229b1b82c6270eead6a77a6d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
net/mac80211/mlme.c
18 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/iwlegacy/4965-mac.c
drivers/net/wireless/iwlegacy/common.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
net/nfc/llcp/sock.c