Pull ec into test branch

diff --combined drivers/acpi/ec.c
index 4a909bfb805cff49387cf1ef71f9efb6da63d569,e2cfc9e078e9bfb0d42d8703180f88f7686c654a..08c12588af6910cf98d236823463dc8fb105eb01
--- 1/drivers/acpi/ec.c
--- 2/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@@ -92,7 -92,7 +92,7 @@@ static struct acpi_driver acpi_ec_drive
  };
  
  /* If we find an EC via the ECDT, we need to keep a ptr to its context */
- struct acpi_ec {
+ static struct acpi_ec {
        acpi_handle handle;
        unsigned long uid;
        unsigned long gpe;
@@@ -367,7 -367,7 +367,7 @@@ int ec_write(u8 addr, u8 val
  
  EXPORT_SYMBOL(ec_write);
  
 -extern int ec_transaction(u8 command,
 +int ec_transaction(u8 command,
                          const u8 * wdata, unsigned wdata_len,
                          u8 * rdata, unsigned rdata_len)
  {