You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		17 years ago
..
Kconfig	ACPI: always enable CONFIG_PNPACPI on CONFIG_ACPI kernels	18 years ago
Makefile	PNP: remove old CONFIG_PNP_DEBUG option	17 years ago
core.c	Merge branch 'linus' into test	17 years ago
pnpacpi.h	PNPACPI: move _CRS/_PRS warnings closer to the action	17 years ago
rsparser.c	PNP: convert to using pnp_dbg()	17 years ago