From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 21 Jul 2010 08:26:37 +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~34^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=52d90145fb8bb52228bf7273cbccae4530203758;p=users%2Fjedix%2Flinux-maple.git

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

52d90145fb8bb52228bf7273cbccae4530203758