Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Jul 2013 18:43:37 +0000 (14:43 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Jul 2013 18:43:37 +0000 (14:43 -0400)
commit718803d161936cf347a21a5a1df29c11fbd4978d
tree53a8a1c3c37ab8b62219a0c80c2f872417097f54
parent0ba568d7be1e6b355aa80adcf2c93de41e5c2afc
parenta53ee0a308b16e392e0219c585b10f329345766b
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes