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	powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks	2008-09-23 10:41:28 -05:00
pnpacpi	PnP: move pnpacpi/pnpbios_init to after PCI init	2008-10-10 08:00:17 -07:00
pnpbios	Merge commit 'origin'	2008-10-15 11:31:54 +11:00
base.h	make pnp_add_card_id() static	2008-07-26 12:00:11 -07:00
card.c	make pnp_add_card_id() static	2008-07-26 12:00:11 -07:00
core.c	PNP: convert resource options to single linked list	2008-07-16 23:27:07 +02:00
driver.c	PNP: change pnp_add_id() to allocate its own pnp_id structures	2008-04-29 03:22:16 -04:00
interface.c	PNP: convert resource options to single linked list	2008-07-16 23:27:07 +02:00
Kconfig	Use menuconfig objects: PNP	2007-07-16 09:05:40 -07:00
Makefile	PnP: move pnpacpi/pnpbios_init to after PCI init	2008-10-10 08:00:17 -07:00
manager.c	PNP: convert resource options to single linked list	2008-07-16 23:27:07 +02:00
quirks.c	pnp: have quirk_system_pci_resources() include io resources	2008-07-26 12:00:02 -07:00
resource.c	PNP: avoid legacy IDE IRQs	2008-07-16 23:27:07 +02:00
support.c	PNP: fix formatting of dbg_pnp_show_resources() output	2008-08-01 12:46:41 -07:00
system.c	PNP: replace pnp_resource_table with dynamically allocated resources	2008-07-16 23:27:05 +02:00