From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 30 Mar 2009 03:04:53 +0000 (+1100)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.6.30-rc1~619^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ff9a26b786c35ee8d2a66222924a807ec851a9f;p=pandora-kernel.git

Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/include/asm/elf.h
	drivers/i2c/busses/i2c-mpc.c
---

9ff9a26b786c35ee8d2a66222924a807ec851a9f
Reading git-diff-tree failed