From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 30 Jun 2011 17:34:06 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.1-rc1~316^2~232^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df2cbe40753dc36af294c30209ed909869aca6cf;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

df2cbe40753dc36af294c30209ed909869aca6cf