From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 15 Oct 2008 00:31:54 +0000 (+1100)
Subject: Merge commit 'origin'
X-Git-Tag: v2.6.28-rc1~569^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dc6472581f693b5fc95aebedf67b4960fb85cf0;p=pandora-kernel.git

Merge commit 'origin'

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h
---

6dc6472581f693b5fc95aebedf67b4960fb85cf0
Reading git-diff-tree failed