Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 8 May 2014 15:36:40 +0000 (11:36 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 8 May 2014 15:36:40 +0000 (11:36 -0400)
commit0d770a82ad8a46b12d706cf11cd11e274fe92302
tree27447232a00683077b5495029d868176a63a0706
parentd294d0286af8afbb714e046a7cb9caa4c44fe133
parent017a64161f6d082f6e3ed85646217bd7217af15a
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next