author | Len Brown <len.brown@intel.com> | |
Sat, 16 Dec 2006 05:45:07 +0000 (00:45 -0500) | ||
committer | Len Brown <len.brown@intel.com> | |
Sat, 16 Dec 2006 05:45:07 +0000 (00:45 -0500) |
Conflicts:
drivers/acpi/ec.c
drivers/acpi/ec.c
1 | 2 | |||
---|---|---|---|---|
MAINTAINERS | patch | | diff1 | | diff2 | | blob | history |
arch/i386/kernel/acpi/boot.c | patch | | diff1 | | diff2 | | blob | history |
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | patch | | diff1 | | diff2 | | blob | history |
drivers/acpi/ec.c | patch | | diff1 | | diff2 | | blob | history |
drivers/acpi/glue.c | patch | | diff1 | | diff2 | | blob | history |
include/asm-i386/acpi.h | patch | | diff1 | | diff2 | | blob | history |
include/asm-x86_64/acpi.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc MAINTAINERS
Simple merge
diff --cc arch/i386/kernel/acpi/boot.c
Simple merge
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
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