]> 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)
commiteec8751f1945f213bd2a2383c18aa9ac719b3077
tree3b5e1c94e6aca1d132491ade8d033733ab06e328
parent7a9c60d0f8d5b1b07ed28163d6ef87fbd23a0392
parentf4c37dfd8e1a079fdc6082b41472bd8c8decf30e
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