Len Brown 057316cc6a Merge branch 'linus' into test ...

Conflicts:
	MAINTAINERS
	arch/x86/kernel/acpi/boot.c
	arch/x86/kernel/acpi/sleep.c
	drivers/acpi/Kconfig
	drivers/pnp/Makefile
	drivers/pnp/quirks.c

Signed-off-by: Len Brown <len.brown@intel.com>

2008-10-23 00:11:07 -04:00

..

isapnp

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

pnpacpi

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

pnpbios

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

base.h

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

card.c

make pnp_add_card_id() static

2008-07-26 12:00:11 -07:00

core.c

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

driver.c

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

interface.c

PNP: create device attributes via default device attributes

2008-10-16 09:24:51 -07:00

Kconfig

PNP: remove old CONFIG_PNP_DEBUG option

2008-10-10 23:35:33 -04:00

Makefile

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

manager.c

PNP: convert to using pnp_dbg()

2008-10-10 23:34:33 -04:00

quirks.c

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

resource.c

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

support.c

PNP: convert to using pnp_dbg()

2008-10-10 23:34:33 -04:00

system.c

…