From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 23 May 2009 10:16:05 +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.30-rc8~15^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=355532bdda14a7162cee55fdd67600bf9bc9a152;p=thirdparty%2Fkernel%2Flinux.git

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

355532bdda14a7162cee55fdd67600bf9bc9a152