From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 3 Feb 2012 19:14:07 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.3-rc4~34^2~34^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=157ca9eae92bc5247f93bea4ecb50dfacc283a04;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
---

157ca9eae92bc5247f93bea4ecb50dfacc283a04