Pull trivial into test branch
Len Brown [Sat, 16 Dec 2006 05:45:07 +0000 (00:45 -0500)]
Conflicts:

drivers/acpi/ec.c

1  2 
MAINTAINERS
arch/i386/kernel/acpi/boot.c
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
drivers/acpi/ec.c
drivers/acpi/glue.c
include/asm-i386/acpi.h
include/asm-x86_64/acpi.h

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -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;
  
Simple merge
Simple merge
Simple merge