Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Apr 2014 19:02:03 +0000 (15:02 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Apr 2014 19:02:03 +0000 (15:02 -0400)
commit22b3b9578da730272d5ca2f3bbf718c7324ff27e
treedcdb3a13f5ceb89b124e0745097699575ccd5a9f
parentbf4c69f7dd8e0c3427262cc11652227ec7256a75
parent4bfee8e8c13fc9477eb9420efd5a5d12e32ac614
Merge branch 'for-linville' of git://github.com/kvalo/ath