Merge branch 'acpi-conversion' into acpi-assorted

The following commits depend on the 'acpi-conversion' material.

Conflicts:
	drivers/acpi/acpi_platform.c

diff --cc drivers/acpi/acpi_platform.c
index ed0f06390245ba7c40049a330104690bda6a984b,c20b02beec7c44bdcf7bd43f20ad5d2fd4803563..aef79db906fe8c89e039c2ecb82f05cf49117338
--- 1/drivers/acpi/acpi_platform.c
--- 2/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@@ -29,10 -29,8 +29,13 @@@ ACPI_MODULE_NAME("platform")
  static const struct acpi_device_id acpi_platform_device_ids[] = {
  
        { "PNP0D40" },
+       { "ACPI0003" },
+       { "VPC2004" },
 +
 +      /* Intel Smart Sound Technology */
 +      { "INT33C8" },
 +      { "80860F28" },
++
        { }
  };