From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 12 Jun 2009 06:53:38 +0000 (+1000)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.6.31-rc1~331^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc47ab0241c7c86da4f5e5f82fbca7d45387c18d;p=pandora-kernel.git

Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/kernel/asm-offsets.c
---

bc47ab0241c7c86da4f5e5f82fbca7d45387c18d
Reading git-diff-tree failed