tree bcf338e32ce63fe65eb12a44989a6008f8a34f63
parent 49a59543eb5a5d268b3d11747f9c3c557ae271a0
parent 62c83ac4d6bcfa6a116c8f1c8ace05cb3933a4f1
author John W. Linville <linville@tuxdriver.com> 1317668375 -0400
committer John W. Linville <linville@tuxdriver.com> 1317668375 -0400

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