tree 10c02a67e231993f74ab32bc0cdb51a74643b48e
parent 16e754535a69152c12494da18eb3ea7947f5a434
parent f697267f827516fba4d0c325ed1db1e72f402f11
author John W. Linville <linville@tuxdriver.com> 1406135177 -0400
committer John W. Linville <linville@tuxdriver.com> 1406135177 -0400

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