From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 27 Feb 2012 18:14:47 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.3-rc7~39^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eea79e0713d94b02952f6c591b615710fd40a562;p=thirdparty%2Fkernel%2Flinux.git

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

eea79e0713d94b02952f6c591b615710fd40a562