From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 19 Dec 2011 18:54:26 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: stable/for-linus-3.4-tag~96^2~178
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9f6e20cee6253c4ca5faacba8dbd09ebe70132ed;p=users%2Fdwmw2%2Flinux.git

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

9f6e20cee6253c4ca5faacba8dbd09ebe70132ed