Conflicts:

	drivers/acpi/sbs.c
Signed-off-by: NLen Brown <len.brown@intel.com>