tree a4f5c7711e28092367c1d886a31972a98b571565
parent 5a6e0cf70743f30c17ccb5f228db9a124b0e7477
parent 057397943eee0bf3bc01a58ee52a9a6f1810258e
author John W. Linville <linville@tuxdriver.com> 1376070550 -0400
committer John W. Linville <linville@tuxdriver.com> 1376070550 -0400

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