From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 28 Apr 2011 14:30:45 +0000 (+0100)
Subject: Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux... 
X-Git-Tag: upstream/snapshot3+hdmi~10530^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef267500094632e0b8229e284e7295ef858da362;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
---

ef267500094632e0b8229e284e7295ef858da362