Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Dec 2011 19:25:17 +0000 (14:25 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Dec 2011 19:25:17 +0000 (14:25 -0500)
commit640f5950a7d9fd0d279d843b261eb934793605fb
tree0f6f4309d8b02c220243757da1cd06f4d5f6a9e9
parent7c4559c92d45949726d7cf687a010664730a07da
parent7e95e365d5399647a41e10059e4b09826b82d78b
Merge branch 'for-linville' of git://github.com/kvalo/ath6kl