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

..

bioscalls.c

…

core.c

Merge branch 'linus' into test

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

Kconfig

…

Makefile

PNP: remove old CONFIG_PNP_DEBUG option

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

pnpbios.h

…

proc.c

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2008-04-30 11:52:52 -07:00

rsparser.c

PNP: convert to using pnp_dbg()

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