From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 31 May 2010 00:01:50 +0000 (+1000)
Subject: Merge commit 'kumar/next' into next
X-Git-Tag: v2.6.35-rc2~55^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecca1a34befbb13fc23d9a2cc0d6b725c7727fb2;p=pandora-kernel.git

Merge commit 'kumar/next' into next

Conflicts:
	arch/powerpc/sysdev/fsl_msi.c
---

ecca1a34befbb13fc23d9a2cc0d6b725c7727fb2
Reading git-diff-tree failed