Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 20 Jun 2012 18:35:31 +0000 (14:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 20 Jun 2012 18:35:31 +0000 (14:35 -0400)
commitce77903c915ba05668ecffabd0e20bc2a61c2b3a
treea33a6c55c56ee52e90eea8bab53d28aef149af80
parentdaf67ce8cffd148308ae15c25fb06c1fc20c88f1
parentd987dd137bac8dca9b0015763d3106f48bb8a596
Merge branch 'for-linville' of git://github.com/kvalo/ath6kl