]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf7e25a17dbb497604831b86cc9a9f882a9a373ac
tree938a7bd50bbef0215a20dfec99007b4c30828019
parent19030a5130394ce161121348fed8a1c8a7d9a548
parent1494ca5a40f645427d65043de20c8dd24742a476
Merge branch 'master' of git://git.kernel.org/pub/scm/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