From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 8 Jun 2010 18:40:08 +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.35-rc3~14^2~1
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=76962be8491b18ae7ff4fd6a4accd398bdb402a2

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

76962be8491b18ae7ff4fd6a4accd398bdb402a2