From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 9 Dec 2011 19:07:12 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.2-rc6~3^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7ab5f1c323e137120561daeec75e91a1bd9ec8b;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

e7ab5f1c323e137120561daeec75e91a1bd9ec8b