From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 8 Jun 2011 17:44:21 +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~450^2~57
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0c33addcba2ce753b4e2746db99feaae2f82a85;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

c0c33addcba2ce753b4e2746db99feaae2f82a85