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> |
||
---|---|---|
.. | ||
main.c | ||
Makefile | ||
proc.c | ||
sleep.h | ||
wakeup.c |
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> |
||
---|---|---|
.. | ||
main.c | ||
Makefile | ||
proc.c | ||
sleep.h | ||
wakeup.c |