tree 79c301b2c8b5400a39c95e034764cf7a208a16a2
parent bbf71a8f35cf52e97ba129401f82ccefd249c757
parent b571a69745dc90aec3d0505a7ceac2702a93861b
author John W. Linville <linville@tuxdriver.com> 1369853445 -0400
committer John W. Linville <linville@tuxdriver.com> 1369853445 -0400

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next