]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge ../linus
authorDave Jones <davej@redhat.com>
Tue, 12 Dec 2006 22:41:41 +0000 (17:41 -0500)
committerDave Jones <davej@redhat.com>
Tue, 12 Dec 2006 22:41:41 +0000 (17:41 -0500)
commitc4366889dda8110247be59ca41fddb82951a8c26
tree705c1a996bed8fd48ce94ff33ec9fd00f9b94875
parentdb2fb9db5735cc532fd4fc55e94b9a3c3750378e
parente1036502e5263851259d147771226161e5ccc85a
Merge ../linus

Conflicts:

drivers/cpufreq/cpufreq.c
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq_conservative.c
drivers/cpufreq/cpufreq_ondemand.c
include/asm-i386/msr.h
include/asm-x86_64/msr.h