From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 4 Jun 2009 16:02:58 +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~14^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=754c0f9a95b685163cfa9ea3ba9bd48310f9b06f;p=users%2Fhch%2Fblock.git

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

754c0f9a95b685163cfa9ea3ba9bd48310f9b06f