From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 14 Sep 2012 17:53:49 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.7-rc1~145^2~163^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9316f0e3c6ba524d8fa14bfded048b252891931a;p=users%2Fhch%2Fmisc.git

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

9316f0e3c6ba524d8fa14bfded048b252891931a