Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 26 Sep 2013 18:54:17 +0000 (14:54 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 26 Sep 2013 18:54:17 +0000 (14:54 -0400)
commit98497bb241bc99b6506e92d1d3a9386eafd39aa3
tree223316ad99ce56ce8fbca56ddafffada109ccfbd
parentb75ff5e84bb6c2d43a8ec39b240c80f0543821f0
parent763b8cd31493f452094fd0eaeedb8cad37c756a2
Merge branch 'for-linville' of git://github.com/kvalo/ath