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)
commitfd2841c5b59c276796f730b77ef37408c0909f9c
tree34329300850e4addad576325840b6715e6894a9a
parent0af5491c2f6069bb6cff4260619749a90a208c98
parent0ff1bd35f5aece42879b04cbfe6b4040cf50a697
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/dvm/debugfs.c
drivers/net/wireless/iwlwifi/iwl-drv.c