From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 12 Dec 2010 23:45:39 +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-rc6~12^2~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=819c1a651fec6b370211609ce6eceefd20cf31e4;p=~emulex%2Finfiniband.git

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

819c1a651fec6b370211609ce6eceefd20cf31e4