Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 4 Nov 2013 19:51:28 +0000 (14:51 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 4 Nov 2013 19:51:28 +0000 (14:51 -0500)
commit87bc0728d462ae37841a550542829aa65a97e7c2
tree266afb90f501b814c0a79f10a7afd86a6a33d631
parentf421436a591d34fa5279b54a96ac07d70250cc8d
parent01925efdf7e03b4b803b5c9f985163d687f7f017
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
drivers/net/wireless/ath/ath10k/debug.h
drivers/net/wireless/ath/ath10k/wmi.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/atmel.c
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
drivers/net/wireless/iwlwifi/mvm/rs.h
include/net/bluetooth/bluetooth.h
include/net/bluetooth/hci_core.h
include/net/bluetooth/rfcomm.h