From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 2 Jan 2010 11:16: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.33-rc4~84^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1df4bb4af42459a4a10e7b21794a6f44463534e6;p=linux.git

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

1df4bb4af42459a4a10e7b21794a6f44463534e6