* Zhang Rui <rui.zhang@xxxxxxxxx> wrote: > > x86_32: Mark ACPI NVS memory region. > > Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx> > --- > arch/x86/kernel/e820_32.c | 26 ++++++++++++++++++++++++++ please do this change against tip/master or linux-next, as this file has been heavily modified and unified already. See: http://people.redhat.com/mingo/tip.git/README Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html