Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 9 Sep 2014 19:00:06 +0000 (15:00 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 9 Sep 2014 19:00:06 +0000 (15:00 -0400)
commit3b924ea1ac55caca853992b425a56513d74d67dc
treed3d48369b31e829820c7268cd5bf393fbe2dae8f
parentab09b95cbfecc3c9dd45268176f6fd13beb75bcb
parent2cddddc56a1179aa71b460ad616176c237d4a243
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes
drivers/net/wireless/iwlwifi/pcie/drv.c