Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c

diff --cc Documentation/feature-removal-schedule.txt
index 7ebca0775ec18590856b285b3cca4dff0b0f4546,031029e89fd9c21970189094715ae872c6efb02e..64ce44da59366bb044c1a30850d94a1c2eab6d3d
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -273,32 -251,11 +251,33 @@@ Who:    Jean Delvare <khali@linux-fr.org
  
  ---------------------------
  
- What: ftape
- When: 2.6.20
- Why:  Orphaned for ages.  SMP bugs long unfixed.  Few users left
-       in the world.
- Who:  Jeff Garzik <jeff@garzik.org>
+ 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 <kaber@trash.net>
  
  ---------------------------
 +
 +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 <venkatesh.pallipadi@intel.com>
 +
 +---------------------------

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_conservative.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_ondemand.c
Simple merge

diff --cc include/asm-i386/msr.h
Simple merge

diff --cc include/asm-x86_64/msr.h
Simple merge