From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 7 Nov 2010 16:11:20 +0000 (+0000)
Subject: Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
X-Git-Tag: v2.6.37-rc2~27^2~8
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=261ca205817deb3d3dfd0be218cc0154be8e6472

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

261ca205817deb3d3dfd0be218cc0154be8e6472