From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 30 Jul 2009 09:46:12 +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.31-rc6~40^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5dbc80f69e131ecca42a5958b7785a57851c80d7;p=linux.git

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

5dbc80f69e131ecca42a5958b7785a57851c80d7