Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 1 Dec 2014 20:51:31 +0000 (15:51 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 1 Dec 2014 20:51:31 +0000 (15:51 -0500)
commitcbe1bc2383ad69a35e4b030c00642785b8b135e8
treefd73d9b59dc6d0a5b419cd6d5f6554dbb026ee25
parent992066c8d3f24d3b5779b1309f8a67634fac1c24
parentfe2407a889f7b6530b7e231e7c866f5c5d223657
Merge branch 'for-linville' of git://github.com/kvalo/ath