Merge branch 'ec' into release

Conflicts:
	drivers/acpi/ec.c

Signed-off-by: Len Brown <len.brown@intel.com>

diff --cc drivers/acpi/ec.c
index f28619d658f70e58fff7e4b55a0a93353ceb6033,dc5561809529c4a2c09eb15828582878c2589826..08b8cf79946b6735291e709e7ef59b68b4dccd70
--- 1/drivers/acpi/ec.c
--- 2/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@@ -871,14 -793,7 +827,12 @@@ static int acpi_ec_add(struct acpi_devi
        acpi_ec_add_fs(device);
        pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
                          ec->gpe, ec->command_addr, ec->data_addr);
-       pr_info(PREFIX "driver started in %s mode\n",
-               (test_bit(EC_FLAGS_GPE_MODE, &ec->flags))?"interrupt":"poll");
 -      return 0;
 +
 +      ret = ec_install_handlers(ec);
 +
 +      /* EC is fully operational, allow queries */
 +      clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
 +      return ret;
  }
  
  static int acpi_ec_remove(struct acpi_device *device, int type)