From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 1 Dec 2014 20:51:31 +0000 (-0500)
Subject: Merge branch 'for-linville' of git://github.com/kvalo/ath
X-Git-Tag: v3.19-rc1~118^2~28^2~42
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cbe1bc2383ad69a35e4b030c00642785b8b135e8;p=linux.git

Merge branch 'for-linville' of git://github.com/kvalo/ath
---

cbe1bc2383ad69a35e4b030c00642785b8b135e8