tree bbb3c237a72ec933fa48bb5b413aed15702020a4
parent 392e741939ddb7dd7adf7e4ec414b2140fb3a15b
parent ad226ec22b92d7f0f834015149b1d1118e017f16
author John W. Linville <linville@tuxdriver.com> 1312998679 -0400
committer John W. Linville <linville@tuxdriver.com> 1312998679 -0400

Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl