From: John W. Linville <linville@tuxdriver.com>
Date: Sat, 22 Sep 2012 16:19:22 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.6~22^2~3^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1199992df2417dc9a1db1b19930ea4d0a697a61e;p=users%2Fdwmw2%2Flinux.git

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

1199992df2417dc9a1db1b19930ea4d0a697a61e