]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc307000c67f6193c623a73de4f089866a6c12ecf
tree266afb90f501b814c0a79f10a7afd86a6a33d631
parent8382a55f86589dd45db42a1119f3a83ba6e272f1
parentdb8ab3f7e917bdba1c93eecb4dc8530c27d09397
Merge branch 'master' of git://git.kernel.org/pub/scm/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