]> 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>
Wed, 25 Jun 2014 19:29:03 +0000 (15:29 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 25 Jun 2014 19:29:03 +0000 (15:29 -0400)
commit21e3e2d770c25f77fe2e35f6c64d37d3b303d4e9
treef637867461ac228db910989299c11509ed0ea129
parent5565120615ff3b4b54f43ff07c8ada0a8ae8afa3
parenta01b72a110d1f29731a8614223970161453047e0
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