From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 16 May 2014 18:15:28 +0000 (-0400)
Subject: Merge branch 'for-linville' of git://github.com/kvalo/ath
X-Git-Tag: v3.16-rc1~27^2~122^2^2~42
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=75e58071c0c64f331ccc4c0037990a1e50099f7f;p=linux.git

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

75e58071c0c64f331ccc4c0037990a1e50099f7f