Pull trivial into release branch

diff --combined Documentation/feature-removal-schedule.txt
index f2024df7ebe52985461912c4bab25179c9e956b1,2ee16b49e10e13324a6dc66defb8c73f92d8e91c..fc532395d11687103d21748d59a61570e74c6c15
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -226,23 -226,6 +226,23 @@@ Who:     Jean Delvare <khali@linux-fr.org
  
  ---------------------------
  
 +What: i2c_adapter.dev
 +      i2c_adapter.list
 +When: July 2007
 +Why:  Superfluous, given i2c_adapter.class_dev:
 +        * The "dev" was a stand-in for the physical device node that legacy
 +          drivers would not have; but now it's almost always present.  Any
 +          remaining legacy drivers must upgrade (they now trigger warnings).
 +        * The "list" duplicates class device children.
 +      The delay in removing this is so upgraded lm_sensors and libsensors
 +      can get deployed.  (Removal causes minor changes in the sysfs layout,
 +      notably the location of the adapter type name and parenting the i2c
 +      client hardware directly from their controller.)
 +Who:  Jean Delvare <khali@linux-fr.org>,
 +      David Brownell <dbrownell@users.sourceforge.net>
 +
 +---------------------------
 +
  What: IPv4 only connection tracking/NAT/helpers
  When: 2.6.22
  Why:  The new layer 3 independant connection tracking replaces the old
@@@ -273,3 -256,48 +273,48 @@@ Why:     Speedstep-centrino driver with ACP
  Who:  Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
  
  ---------------------------
+ 
+ What: ACPI hotkey driver (CONFIG_ACPI_HOTKEY)
+ When: 2.6.21
+ Why:  hotkey.c was an attempt to consolidate multiple drivers that use
+       ACPI to implement hotkeys.  However, hotkeys are not documented
+       in the ACPI specification, so the drivers used undocumented
+       vendor-specific hooks and turned out to be more different than
+       the same.
+ 
+       Further, the keys and the features supplied by each platform
+       are different, so there will always be a need for
+       platform-specific drivers.
+ 
+       So the new plan is to delete hotkey.c and instead, work on the
+       platform specific drivers to try to make them look the same
+       to the user when they supply the same features.
+ 
+       hotkey.c has always depended on CONFIG_EXPERIMENTAL
+ 
+ Who:  Len Brown <len.brown@intel.com>
+ 
+ ---------------------------
+ 
+ What: /sys/firmware/acpi/namespace
+ When: 2.6.21
+ Why:  The ACPI namespace is effectively the symbol list for
+       the BIOS.  The device names are completely arbitrary
+       and have no place being exposed to user-space.
+ 
+       For those interested in the BIOS ACPI namespace,
+       the BIOS can be extracted and disassembled with acpidump
+       and iasl as documented in the pmtools package here:
+       http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils
+ 
+ Who:  Len Brown <len.brown@intel.com>
+ 
+ ---------------------------
+ 
+ What: /proc/acpi/button
+ When: August 2007
+ Why:  /proc/acpi/button has been replaced by events to the input layer
+       since 2.6.20.
+ Who:  Len Brown <len.brown@intel.com>
+ 
+ ---------------------------

diff --combined MAINTAINERS
index 4ccc5fa06d092cf83d8034293050bd3c1973bead,d1f454c6dbe48cd1cf296a196ca8ef6feb5a5ad4..8e1d7da07ce3d8be0ef3767de778b02ec5f6c395
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -207,16 -207,45 +207,45 @@@ S:      Supporte
  ACPI
  P:    Len Brown
  M:    len.brown@intel.com
+ M:    lenb@kernel.org
  L:    linux-acpi@vger.kernel.org
  W:    http://acpi.sourceforge.net/
  T:    git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
- S:    Maintained
+ S:    Supported
+ 
+ ACPI BATTERY DRIVERS
+ P:    Vladimir P. Lebedev
+ M:    vladimir.p.lebedev@intel.com
+ L:    linux-acpi@vger.kernel.org
+ W:    http://acpi.sourceforge.net/
+ S:    Supported
+ 
+ ACPI EC DRIVER
+ P:    Alexey Starikovskiy
+ M:    alexey.y.starikovskiy@linux.intel.com
+ L:    linux-acpi@vger.kernel.org
+ W:    http://acpi.sourceforge.net/
+ S:    Supported
+ 
+ ACPI FAN DRIVER
+ P:    Konstantin A. Karasyov
+ M:    konstantin.a.karasyov@intel.com
+ L:    linux-acpi@vger.kernel.org
+ W:    http://acpi.sourceforge.net/
+ S:    Supported
  
  ACPI PCI HOTPLUG DRIVER
  P:    Kristen Carlson Accardi
  M:    kristen.c.accardi@intel.com
  L:    pcihpd-discuss@lists.sourceforge.net
- S:    Maintained
+ S:    Supported
+ 
+ ACPI THERMAL DRIVER
+ P:    Konstantin A. Karasyov
+ M:    konstantin.a.karasyov@intel.com
+ L:    linux-acpi@vger.kernel.org
+ W:    http://acpi.sourceforge.net/
+ S:    Supported
  
  AD1816 SOUND DRIVER
  P:    Thorsten Knabe
@@@ -412,32 -441,20 +441,32 @@@ S:      Maintaine
  ARM/INTEL IOP32X ARM ARCHITECTURE
  P:    Lennert Buytenhek
  M:    kernel@wantstofly.org
 +P:    Dan Williams
 +M:    dan.j.williams@intel.com
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 -S:    Maintained
 +S:    Supported
 +
 +ARM/INTEL IOP33X ARM ARCHITECTURE
 +P:    Dan Williams
 +M:    dan.j.williams@intel.com
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +S:    Supported
  
  ARM/INTEL IOP13XX ARM ARCHITECTURE
  P:    Lennert Buytenhek
  M:    kernel@wantstofly.org
 +P:    Dan Williams
 +M:    dan.j.williams@intel.com
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 -S:    Maintained
 +S:    Supported
  
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  P:    Lennert Buytenhek
  M:    kernel@wantstofly.org
 +P:    Dan Williams
 +M:    dan.j.williams@intel.com
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 -S:    Maintained
 +S:    Supported
  
  ARM/INTEL IXP2000 ARM ARCHITECTURE
  P:    Lennert Buytenhek
@@@ -460,10 -477,8 +489,10 @@@ S:       Maintaine
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  P:    Lennert Buytenhek
  M:    kernel@wantstofly.org
 +P:    Dan Williams
 +M:    dan.j.williams@intel.com
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 -S:    Maintained
 +S:    Supported
  
  ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
  P:    Lennert Buytenhek
@@@ -1085,7 -1100,7 +1114,7 @@@ DOCKING STATION DRIVE
  P:    Kristen Carlson Accardi
  M:    kristen.c.accardi@intel.com
  L:    linux-acpi@vger.kernel.org
- S:    Maintained
+ S:    Supported
  
  DOUBLETALK DRIVER
  P:    James R. Van Zandt
@@@ -2535,7 -2550,7 +2564,7 @@@ PCIE HOTPLUG DRIVE
  P:    Kristen Carlson Accardi
  M:    kristen.c.accardi@intel.com
  L:    pcihpd-discuss@lists.sourceforge.net
- S:    Maintained
+ S:    Supported
  
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
@@@ -2593,12 -2608,6 +2622,12 @@@ P:    Adam Bela
  M:    ambx1@neo.rr.com
  S:    Maintained
  
 +PNXxxxx I2C DRIVER
 +P:    Vitaly Wool
 +M:    vitalywool@gmail.com
 +L:    i2c@lm-sensors.org
 +S:    Maintained
 +
  PPP PROTOCOL DRIVERS AND COMPRESSORS
  P:    Paul Mackerras
  M:    paulus@samba.org
@@@ -3035,7 -3044,7 +3064,7 @@@ SHPC HOTPLUG DRIVE
  P:    Kristen Carlson Accardi
  M:    kristen.c.accardi@intel.com
  L:    pcihpd-discuss@lists.sourceforge.net
- S:    Maintained
+ S:    Supported
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER
  P:    Pierre Ossman