]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 16 Jan 2014 17:54:17 +0000 (12:54 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 16 Jan 2014 17:54:17 +0000 (12:54 -0500)
commitc8603ae9bdfb98e2fcbf4e424080ceeedcf6dc04
tree7b04bc63c08adb384a1fd4eb118f364c56aa4dab
parentefc683b472cdb62e373e98acedb80e7b53db3291
parenta0a51f85d57061f57f78c424b9533c50934cb5cd
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/dvm/ucode.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/rs.c