From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 17 Nov 2011 19:15:47 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.2-rc3~25^2~5^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4be3c2da1ab4344d3d5f63d6ec1952a3c6e635c;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

c4be3c2da1ab4344d3d5f63d6ec1952a3c6e635c