Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 8 Sep 2014 15:14:56 +0000 (11:14 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 8 Sep 2014 15:14:56 +0000 (11:14 -0400)
commit61a3d4f9d52c00b2016bc27fc66b10a194043f76
tree938a7bd50bbef0215a20dfec99007b4c30828019
parentdb906eb2101b0564b0c65edf4a8647395196342e
parent1bd3fa7b8c9b2936c16c6e6452f9cc991c405872
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
13 files changed:
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/iwl-7000.c
drivers/net/wireless/iwlwifi/iwl-8000.c
include/net/bluetooth/hci_core.h
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c
net/ieee802154/6lowpan_rtnl.c
net/mac80211/chan.c
net/mac80211/debugfs_sta.c
net/mac80211/mesh_plink.c
net/mac80211/mlme.c
net/mac80211/sta_info.c
net/mac802154/wpan.c