Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Nov 2013 20:53:10 +0000 (15:53 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Nov 2013 20:53:10 +0000 (15:53 -0500)
commitc046555966e4a3a75b731e05ece3b1d763ac56ae
tree2957e97a4052ca069ff7d05abf49e6b9647be9e7
parentdce1ebabcb0ac12113487221663c2aba648dd244
parentc92f06a1dea1e444213d860a20023f72c134e20a
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/iwl-trans.h
drivers/net/wireless/iwlwifi/pcie/tx.c