Pull trivial into test branch

Conflicts:

	drivers/acpi/ec.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/i386/kernel/acpi/boot.c
Simple merge

diff --cc arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
Simple merge

diff --cc drivers/acpi/ec.c
index d713f769b72d703e123a99940ff91ee2622b6ac6,7aa600794ae419027a235223dca08ac82682e046..4a909bfb805cff49387cf1ef71f9efb6da63d569
--- 1/drivers/acpi/ec.c
--- 2/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@@ -367,9 -369,9 +367,9 @@@ 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)
 +                        const u8 * wdata, unsigned wdata_len,
 +                        u8 * rdata, unsigned rdata_len)
  {
        struct acpi_ec *ec;
  

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

diff --cc include/asm-i386/acpi.h
Simple merge

diff --cc include/asm-x86_64/acpi.h
Simple merge