From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 14 Mar 2014 18:25:53 +0000 (-0400)
Subject: Merge branch 'for-linville' of git://github.com/kvalo/ath
X-Git-Tag: v3.15-rc1~113^2~93^2^2~92
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1698aca04085a98e0e22256c0a7f0e686d982084;p=linux.git

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

1698aca04085a98e0e22256c0a7f0e686d982084