Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 13 Jan 2014 19:40:03 +0000 (14:40 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 13 Jan 2014 19:40:03 +0000 (14:40 -0500)
commit559c33d84da71e07816e692bfd73ad92675256a6
treed599948e9c88f115cf697b2a52f0359b3ecd77d4
parentec665facde820179d71d0f064e692f449df2b94f
parent51ab1a0a09a894442e8b091d57222c5425b6d700
Merge branch 'for-linville' of git://github.com/kvalo/ath