]> 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)
commit71d502701b72cf566fa9302995604a413a03ef3b
tree7b04bc63c08adb384a1fd4eb118f364c56aa4dab
parent0a34aba4b6585e5ce0cca7f9ab00ef2f2e4fa016
parent35c6fb845a7bf9d2f4dd4fc08efa6cfc6803a13a
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