From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 6 Jul 2011 19:03:16 +0000 (-0400)
Subject: Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca... 
X-Git-Tag: v3.1-rc1~316^2~189^2^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=333c0dbfcd7847d02d75a2d2a80d2f5e1cdc51dc;p=thirdparty%2Flinux.git

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

333c0dbfcd7847d02d75a2d2a80d2f5e1cdc51dc