Benjamin Herrenschmidt 6dc6472581 Merge commit 'origin' ...

Manual fixup of conflicts on:

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

2008-10-15 11:31:54 +11:00

..

chrp.h

[POWERPC] Make pci_read_irq_line the default

2006-12-04 16:00:04 +11:00

gg2.h

[POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need

2007-08-22 22:43:29 -05:00

Kconfig

[POWERPC] disallow building powermac and tsi108 without PCI

2007-06-29 01:57:00 -05:00

Makefile

[POWERPC] disallow building powermac and tsi108 without PCI

2007-06-29 01:57:00 -05:00

nvram.c

[POWERPC] Rename get_property to of_get_property: arch/powerpc

2007-04-13 03:55:19 +10:00

pci.c

powerpc: Fix CHRP PCI config access for indirect_pci

2008-10-15 10:13:30 +11:00

pegasos_eth.c

mv643xx_eth: get rid of static variables, allow multiple instances

2008-04-28 21:17:07 -07:00

setup.c

Remove asm/a.out.h files for all architectures without a.out support.

2008-09-06 19:30:24 +01:00

smp.c

[POWERPC] Remove old includes from arch/ppc

2007-08-22 22:39:35 -05:00

time.c

powerpc: Use bcd2bin/bin2bcd

2008-08-20 16:34:58 +10:00