tree ca19cd08501a8c3aba2b6c09f5243d00d5a1c18f
parent b4487c2d0edaf1332d7a9f11b5661044955ef5e2
parent 8cb6d9915f77aa4a01181613a5882a7c04e571c3
author John W. Linville <linville@tuxdriver.com> 1321561015 -0500
committer John W. Linville <linville@tuxdriver.com> 1321561015 -0500

Merge branch 'for-linville' of git://github.com/kvalo/ath6kl