]> 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>
Tue, 22 Apr 2014 19:01:24 +0000 (15:01 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Apr 2014 19:01:24 +0000 (15:01 -0400)
commit8defa1a73ebb571b623186b3f95fd6cdff785568
tree7e6fe4f8c3c126496b737962537d51645a826c2c
parent1c359af520eeb2037fc39e445fb9dc64de2c8dcd
parent97cd13e7e4db66e1951e205e421d0c09e21c8a49
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/iwl-7000.c
drivers/net/wireless/iwlwifi/mvm/coex.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/rs.c
drivers/net/wireless/iwlwifi/mvm/rs.h
drivers/net/wireless/iwlwifi/mvm/sf.c