From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 16 Oct 2013 15:04:41 +0000 (+0200)
Subject: Merge branch 'acpi-conversion' into acpi-assorted
X-Git-Tag: v3.13-rc1~96^2~10^2~3^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0ad8568c81979be9c115d22ff1c3580f5ecd0bb;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'acpi-conversion' into acpi-assorted

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

Conflicts:
	drivers/acpi/acpi_platform.c
---

c0ad8568c81979be9c115d22ff1c3580f5ecd0bb
diff --cc drivers/acpi/acpi_platform.c
index ed0f063,c20b02b..aef79db
--- a/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" },
++
  	{ }
  };