From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 28 Sep 2012 17:49:21 +0000 (-0400)
Subject: Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca... 
X-Git-Tag: v3.7-rc1~145^2~30^2~38
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f1b98bb367f672ee78800fa62880b522bef86eed;p=users%2Fhch%2Fmisc.git

Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
---

f1b98bb367f672ee78800fa62880b522bef86eed