From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 25 Sep 2010 09:27:50 +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-rc6~11^2~4
X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=f933b87e6f06fcce5988fd5e8ebf3a97858a7155

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

f933b87e6f06fcce5988fd5e8ebf3a97858a7155