linux/drivers/pnp
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
..
isapnp
pnpacpi
pnpbios Merge commit 'origin' 2008-10-15 11:31:54 +11:00
base.h
card.c
core.c
driver.c
interface.c
Kconfig
Makefile
manager.c
quirks.c
resource.c
support.c
system.c