Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
commitcb4ec37d485b05decf4bdcd11724362c7f03606a
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 19:22:01 +0000 (22 14:22 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 19:22:01 +0000 (22 14:22 -0500)
tree7c7fdd6531b865536a0a2b4c600d8aed83b6be06
parent4668cce527acb3bd048c5e6c99b157a14b214671
parentc3e5d7181afb66657393066bccce0956fab09ab3
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes