From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 6 Jun 2011 17:58:21 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.0-rc3~13^2~27^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c11114717a66455de9fbc3ea69ae00d1aace3c14;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

c11114717a66455de9fbc3ea69ae00d1aace3c14