From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 26 Jun 2014 15:39:36 +0000 (-0400)
Subject: Merge branch 'ath-current' of git://github.com/kvalo/ath
X-Git-Tag: v3.16~18^2~11^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e055a6e20a9105551295da164c31179b82c6227e;p=linux.git

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

e055a6e20a9105551295da164c31179b82c6227e