From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 12 Oct 2009 13:38:08 +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.32-rc5~36^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=edc72786d208e77db94f84dcb0d166c0d23d82f7;p=~shefty%2Frdma-dev.git

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

edc72786d208e77db94f84dcb0d166c0d23d82f7