Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 18 Jun 2013 18:43:50 +0000 (14:43 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 18 Jun 2013 18:43:50 +0000 (14:43 -0400)
commit0b21eb9ad7712f6ad5a2b522c886e8f7f6fd867d
treea30d91122ea014844a2b6562c13982ebf084cc21
parent9d1059c2481885ba7a2af02fc1bf87cae88b302a
parent8a487b1a7432b20ff3f82387a8ce7555a964b44e
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes
drivers/net/wireless/iwlwifi/pcie/tx.c