From: jdl@freescale.com <jdl@freescale.com>
Date: Wed, 7 Sep 2005 20:59:48 +0000 (-0500)
Subject: [PATCH] powerpc: Merge a few more include files
X-Git-Tag: v2.6.14-rc1~482^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb;p=pandora-kernel.git

[PATCH] powerpc: Merge a few more include files

Merge a few asm-ppc and asm-ppc64 header files.
Note: the merge of setup.h intentionally does not carry
forward the m68k cruft.  That means this patch continues
to break the already broken amiga on the ppc32.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

Reading git-diff-tree failed