Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Mar 2013 20:38:28 +0000 (16:38 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Mar 2013 20:38:28 +0000 (16:38 -0400)
commit31c5770b5d7354c308bd41bf2bb3e02e5e0e95b6
tree3135ede01b35ad7a0fe44c18d4ea55d3c512779e
parentc78b3841fac9a59c7494be143aa7f2e69ea47958
parente635c797b3b18ffbe4ef5db27971f48b661f03bd
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next