kernel_optimize_test/arch/powerpc/platforms
David Howells 9db7372445 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 17:01:28 +00:00
..
4xx ppc: Various minor compile fixes 2005-10-11 22:08:12 +10:00
8xx powerpc: Merge enough to start building in arch/powerpc. 2005-09-26 16:04:21 +10:00
52xx [POWERPC] Add missing EXPORTS for mpc52xx support 2006-12-05 11:34:37 +11:00
82xx [POWERPC] Make pci_read_irq_line the default 2006-12-04 16:00:04 +11:00
83xx [POWERPC] Remove ppc_md.pci_map_irq & ppc_swizzle for ARCH=powerpc 2006-12-04 16:00:14 +11:00
85xx [POWERPC] Remove ioremap64 and fixup_bigphys_addr 2006-12-04 20:39:04 +11:00
86xx [POWERPC] Make pci_read_irq_line the default 2006-12-04 16:00:04 +11:00
apus powerpc: Merge enough to start building in arch/powerpc. 2005-09-26 16:04:21 +10:00
cell [POWERPC] spufs: we should only execute init_spu_base on cell 2006-12-04 20:41:11 +11:00
chrp [POWERPC] Merge 32 and 64 bits asm-powerpc/io.h 2006-12-04 20:39:05 +11:00
embedded6xx [POWERPC] Linkstation / kurobox support 2006-12-04 20:42:08 +11:00
iseries [POWERPC] Replace kmalloc+memset with kzalloc 2006-12-04 20:42:09 +11:00
maple [POWERPC] Make pci_read_irq_line the default 2006-12-04 16:00:04 +11:00
pasemi [POWERPC] Refactor 64 bits DMA operations 2006-12-04 20:38:40 +11:00
powermac [POWERPC] Merge 32 and 64 bits asm-powerpc/io.h 2006-12-04 20:39:05 +11:00
prep powerpc: Merge enough to start building in arch/powerpc. 2005-09-26 16:04:21 +10:00
ps3 [POWERPC] ps3: multiplatform build fixes 2006-12-04 20:41:16 +11:00
pseries Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 17:01:28 +00:00
Makefile [POWERPC] Move Efika support files into platforms/52xx 2006-12-04 20:41:39 +11:00