From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 8 Jul 2011 15:03:36 +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~189^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=204d1641d200709c759d8c269458cbc7de378c40;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

204d1641d200709c759d8c269458cbc7de378c40