From: Dave Jones Date: Tue, 12 Dec 2006 22:41:41 +0000 (-0500) Subject: Merge ../linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c4366889dda8110247be59ca41fddb82951a8c26;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge ../linus Conflicts: drivers/cpufreq/cpufreq.c --- c4366889dda8110247be59ca41fddb82951a8c26 diff --cc Documentation/feature-removal-schedule.txt index 7ebca0775ec1,031029e89fd9..64ce44da5936 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@@ -273,32 -251,11 +251,33 @@@ Who: Jean Delvare + What: IPv4 only connection tracking/NAT/helpers + When: 2.6.22 + Why: The new layer 3 independant connection tracking replaces the old + IPv4 only version. After some stabilization of the new code the + old one will be removed. + Who: Patrick McHardy --------------------------- + +What: ACPI hooks (X86_SPEEDSTEP_CENTRINO_ACPI) in speedstep-centrino driver +When: December 2006 +Why: Speedstep-centrino driver with ACPI hooks and acpi-cpufreq driver are + functionally very much similar. They talk to ACPI in same way. Only + difference between them is the way they do frequency transitions. + One uses MSRs and the other one uses IO ports. Functionaliy of + speedstep_centrino with ACPI hooks is now merged into acpi-cpufreq. + That means one common driver will support all Intel Enhanced Speedstep + capable CPUs. That means less confusion over name of + speedstep-centrino driver (with that driver supposed to be used on + non-centrino platforms). That means less duplication of code and + less maintenance effort and no possibility of these two drivers + going out of sync. + Current users of speedstep_centrino with ACPI hooks are requested to + switch over to acpi-cpufreq driver. speedstep-centrino will continue + to work using older non-ACPI static table based scheme even after this + date. + +Who: Venkatesh Pallipadi + +---------------------------