android_kernel_xiaomi_sm8350/drivers/pnp/isapnp
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
..
compat.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
proc.c