]> err.no Git - linux-2.6/commit
ACPI: fix git automerge failure
authorLen Brown <len.brown@intel.com>
Sat, 16 Dec 2006 05:59:38 +0000 (00:59 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 16 Dec 2006 05:59:38 +0000 (00:59 -0500)
commit7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c
treebcffffeb768b904fca87f026e105bac5ecadd776
parent463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc
ACPI: fix git automerge failure

Signed-off-by: Len Brown <len.brown@intel.com>
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c