Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Aug 2013 19:54:06 +0000 (15:54 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Aug 2013 19:54:06 +0000 (15:54 -0400)
commit946951e1419279b7eded84b84da0de7381ee6663
tree5d8cf23970b5f25085505b5cdbe172143c205b56
parentd1e2586f484dfc36eee2b2d3a6c6c77be67ca492
parent9d0e2f0772d394060bf3b17cd1f3a35574365103
Merge branch 'for-linville' of git://github.com/kvalo/ath