]> 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>
Mon, 9 Jul 2012 20:35:18 +0000 (16:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Jul 2012 20:35:18 +0000 (16:35 -0400)
commit50294bc1a9485fcba91ee9e9e204cc5e1466e2ac
tree34329300850e4addad576325840b6715e6894a9a
parent993ea043656dd196d11e267ffe236e6e9c3862b4
parentd8549a2a8fd61130c613c9eda4361fc5103357dd
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/dvm/debugfs.c
drivers/net/wireless/iwlwifi/iwl-drv.c