From: Len Brown <len.brown@intel.com>
Date: Sun, 29 May 2011 08:38:48 +0000 (-0400)
Subject: Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold... 
X-Git-Tag: v3.0-rc1~12^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=6288cf1e768ae73db5ddaaae54d85245cc1c2b56

Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release
---

6288cf1e768ae73db5ddaaae54d85245cc1c2b56
diff --cc drivers/acpi/ec.c
index fa848c4116a8,fa848c4116a8,fa848c4116a8,62628e5eba39,fa848c4116a8,30ca71791bf2,fa848c4116a8..0b954c6702be
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@@@@@@@ -938,8 -938,8 -938,8 -938,16 -938,8 -938,11 -938,8 +938,19 @@@@@@@@ static struct dmi_system_id __initdata 
       	ec_flag_msi, "MSI hardware", {
       	DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-STAR")}, NULL},
       	{
+++ +++	ec_flag_msi, "Quanta hardware", {
+++ +++	DMI_MATCH(DMI_SYS_VENDOR, "Quanta"),
+++ +++	DMI_MATCH(DMI_PRODUCT_NAME, "TW8/SW8/DW8"),}, NULL},
+++ +++	{
+++ +++	ec_flag_msi, "Quanta hardware", {
+++ +++	DMI_MATCH(DMI_SYS_VENDOR, "Quanta"),
+++ +++	DMI_MATCH(DMI_PRODUCT_NAME, "TW9/SW9"),}, NULL},
+++ +++	{
       	ec_validate_ecdt, "ASUS hardware", {
       	DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL},
+++++ +	{
+++++ +	ec_validate_ecdt, "ASUS hardware", {
+++++ +	DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer Inc.") }, NULL},
       	{},
       };