Conflicts:
	arch/x86/kernel/setup.c
	drivers/acpi/power.c
	init/main.c
Signed-off-by: Len Brown <len.brown@intel.com>