From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 13 Apr 2012 18:28:56 +0000 (-0400)
Subject: Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca... 
X-Git-Tag: v3.5-rc1~109^2~410^2~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f277683477c7bdff8236e731cf882b3ef89dde0d;p=thirdparty%2Fkernel%2Flinux.git

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

f277683477c7bdff8236e731cf882b3ef89dde0d