]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Pull trivial into test branch
authorLen Brown <len.brown@intel.com>
Sat, 16 Dec 2006 05:45:07 +0000 (00:45 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 16 Dec 2006 05:45:07 +0000 (00:45 -0500)
commit463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc
tree1b9171c109496b7f4991fcae0a2e08ed3bbea10d
parent25c68a33b7b74b37793b1250007e5e21d621a7fc
parent7d63c6759188b9b35c789159f6e02cd02d49ec7d
Pull trivial into test branch

Conflicts:

drivers/acpi/ec.c
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