From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 6 Mar 2012 19:16:48 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.3-rc7~11^2~10^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7f466cff75f16ac545f34c7876e6f80225a36a6d;p=karo-tx-linux.git

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

7f466cff75f16ac545f34c7876e6f80225a36a6d