Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Mar 2014 18:25:53 +0000 (14:25 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Mar 2014 18:25:53 +0000 (14:25 -0400)
commit1698aca04085a98e0e22256c0a7f0e686d982084
treee9adbc6d58fda44a00ee6158b8ce3c377318e1f3
parent4e3b3bcd81776527fa6f11624d68849de8c8802e
parent70dd77b4c50da518b57b8b9b125a8c9aabe9bc1a
Merge branch 'for-linville' of git://github.com/kvalo/ath