]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 16 May 2014 18:16:17 +0000 (14:16 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 May 2014 18:16:17 +0000 (14:16 -0400)
commit857e0c74393395a5273a5fd3b51502484501e290
tree3b5e1c94e6aca1d132491ade8d033733ab06e328
parent8aea181094e499eb296802ee9fb4761f6050d635
parent5284080e946605601d9002403851d1987660d9f3
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mvm.h
drivers/net/wireless/iwlwifi/mvm/scan.c
drivers/net/wireless/iwlwifi/mvm/utils.c