Merge branch 'ec' into test

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

diff --cc drivers/acpi/ec.c
index 4c004286b3d9f230f23a0a52ec49105ed0ef0a1b,444cd9ed12c79a772a9012b178d6f7545cffb24a..4178d17aa0edc2bc8576d44ee6d4bae184c6dcfb
--- 1/drivers/acpi/ec.c
--- 2/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@@ -862,22 -871,11 +871,22 @@@ static int ec_install_handlers(struct a
                                                    &acpi_ec_space_handler,
                                                    NULL, ec);
        if (ACPI_FAILURE(status)) {
 -              acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
 -              return -ENODEV;
 +              if (status == AE_NOT_FOUND) {
 +                      /*
 +                       * Maybe OS fails in evaluating the _REG object.
 +                       * The AE_NOT_FOUND error will be ignored and OS
 +                       * continue to initialize EC.
 +                       */
 +                      printk(KERN_ERR "Fail in evaluating the _REG object"
 +                              " of EC device. Broken bios is suspected.\n");
 +              } else {
 +                      acpi_remove_gpe_handler(NULL, ec->gpe,
 +                              &acpi_ec_gpe_handler);
 +                      return -ENODEV;
 +              }
        }
  
-       ec->handlers_installed = 1;
+       set_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags);
        return 0;
  }
  

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

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