From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 15 Aug 2013 19:54:06 +0000 (-0400)
Subject: Merge branch 'for-linville' of git://github.com/kvalo/ath
X-Git-Tag: v3.12-rc1~132^2~84^2^2~109
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=946951e1419279b7eded84b84da0de7381ee6663;p=linux.git

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

946951e1419279b7eded84b84da0de7381ee6663