Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Aug 2011 17:51:19 +0000 (13:51 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Aug 2011 17:51:19 +0000 (13:51 -0400)
commit20adc1aecca5a55d7dba2189c1783c2e6d73fac7
treebbb3c237a72ec933fa48bb5b413aed15702020a4
parent392e741939ddb7dd7adf7e4ec414b2140fb3a15b
parentad226ec22b92d7f0f834015149b1d1118e017f16
Merge branch 'for-linville' of git://git./linux/kernel/git/kvalo/ath6kl