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
..
bioscalls.c	PNPBIOS: remove include/linux/pnpbios.h	2008-04-29 03:22:30 -04:00
core.c	Merge commit 'origin'	2008-10-15 11:31:54 +11:00
Kconfig
Makefile	PNP: turn on -DDEBUG when CONFIG_PNP_DEBUG is set	2008-04-29 03:22:14 -04:00
pnpbios.h	PNPBIOS: remove include/linux/pnpbios.h	2008-04-29 03:22:30 -04:00
proc.c	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2008-04-30 11:52:52 -07:00
rsparser.c	PNP: convert resource options to single linked list	2008-07-16 23:27:07 +02:00