Conflicts:
	arch/x86/kernel/acpi/sleep.c
Signed-off-by: NLen Brown <len.brown@intel.com>