Merge tag 'for-linville-20140725' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 29 Jul 2014 14:32:12 +0000 (10:32 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 29 Jul 2014 14:32:12 +0000 (10:32 -0400)
commit0da4cc6e624675c721e15cd7440ccd65b154f685
tree4be5ee97c08a425fc5c6545083acf2f605075438
parentec87652694897444c03c1e9263cec7f82b83d1aa
parent0ccb7a3485e5526dca69f036b0d6c5148c78b3f8
Merge tag 'for-linville-20140725' of git://github.com/kvalo/ath