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
..
Kconfig	…
Makefile	…
maple.h	…
pci.c	[POWERPC] maple: Kill fixup_maple_ide	2008-03-26 08:44:04 +11:00
setup.c	Remove asm/a.out.h files for all architectures without a.out support.	2008-09-06 19:30:24 +01:00
time.c	powerpc: Use bcd2bin/bin2bcd	2008-08-20 16:34:58 +10:00