android_kernel_motorola_sm6225/drivers/pnp/pnpacpi
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
..
core.c Merge branch 'linus' into test 2008-10-23 00:11:07 -04:00
Kconfig ACPI: always enable CONFIG_PNPACPI on CONFIG_ACPI kernels 2007-02-15 22:38:04 -05:00
Makefile PNP: remove old CONFIG_PNP_DEBUG option 2008-10-10 23:35:33 -04:00
pnpacpi.h PNPACPI: move _CRS/_PRS warnings closer to the action 2008-04-29 03:22:30 -04:00
rsparser.c PNP: convert to using pnp_dbg() 2008-10-10 23:34:33 -04:00