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
gg2.h
Kconfig
Makefile
nvram.c
pci.c	powerpc: Fix CHRP PCI config access for indirect_pci	2008-10-15 10:13:30 +11:00
pegasos_eth.c
setup.c
smp.c
time.c