tree 32d6aff5b5c67649e3ca81e0aa9322f206224aaf
parent 167bf96dd87d2a8360cb9e9783006876dac4f579
parent f991e17ba2584e2be66476cc468f19769efd55cc
author John W. Linville <linville@tuxdriver.com> 1410806227 -0400
committer John W. Linville <linville@tuxdriver.com> 1410806227 -0400

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