Conflicts:
	drivers/acpi/bay.c
	drivers/acpi/dock.c
	drivers/ata/libata-acpi.c
Signed-off-by: NLen Brown <len.brown@intel.com>