Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold...

diff --cc drivers/acpi/ec.c
index fa848c4116a84b3572f0142ccb3d87df8dff2ada,fa848c4116a84b3572f0142ccb3d87df8dff2ada,fa848c4116a84b3572f0142ccb3d87df8dff2ada,62628e5eba399f0a781903e355198e2d28685f27,fa848c4116a84b3572f0142ccb3d87df8dff2ada,30ca71791bf2ad2bda6b478e6d6615525c89a319,fa848c4116a84b3572f0142ccb3d87df8dff2ada..0b954c6702be15bf6ffb378e8984536d8606d404
--- 1/drivers/acpi/ec.c
--- 2/drivers/acpi/ec.c
--- 3/drivers/acpi/ec.c
--- 4/drivers/acpi/ec.c
--- 5/drivers/acpi/ec.c
--- 6/drivers/acpi/ec.c
--- 7/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},
        {},
       };
       

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc include/acpi/actypes.h
Simple merge