From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 7 Oct 2010 18:39:03 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: upstream/snapshot3+hdmi~12689^2~78^2^2~110
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7573eac762af253e0b61b60cce34ab80f2dd45c7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

7573eac762af253e0b61b60cce34ab80f2dd45c7