From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 1 Sep 2010 09:06:27 +0000 (+0100)
Subject: Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
X-Git-Tag: v2.6.36-rc4~64^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1fd317076caf1ee22ddb6a7853a0ca462f0233c5;p=users%2Fdwmw2%2Flinux.git

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
---

1fd317076caf1ee22ddb6a7853a0ca462f0233c5