Pull misc into release branch

Conflicts:

	Documentation/feature-removal-schedule.txt

diff --cc Documentation/feature-removal-schedule.txt
index a5cb7839a679eadc040c71a6db06d33af5083ffc,769862197ac81139530ac44164bba6e5a631c163..c175eedadb5fb358f589d93da61720e9453b73ad
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -180,24 -205,33 +180,11 @@@ Who:   Adrian Bunk <bunk@stusta.de
  
  ---------------------------
  
- 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.
 -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.
--
-       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>
 -Who:  Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
--
-----------------------------
--
  What: ACPI procfs interface
- When: July 2007
- Why:  After ACPI sysfs conversion, ACPI attributes will be duplicated
-       in sysfs and the ACPI procfs interface should be removed.
+ When: July 2008
+ Why:  ACPI sysfs conversion should be finished by January 2008.
+       ACPI procfs interface will be removed in July 2008 so that
+       there is enough time for the user space to catch up.
  Who:  Zhang Rui <rui.zhang@intel.com>
  
  ---------------------------

diff --cc arch/i386/kernel/acpi/boot.c
Simple merge

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/acpi/processor_idle.c
Simple merge

diff --cc drivers/acpi/sleep/main.c
index 42127c0d612c8940d1060c67a5e8b5893567ef88,56afb1c1a494b2040c3f26b65df4d8c2ed8a6272..3279e72a94f81c0c532f72a9bd0284861a1ba345
--- 1/drivers/acpi/sleep/main.c
--- 2/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@@ -210,27 -210,8 +210,22 @@@ static void acpi_hibernation_finish(voi
  
        /* reset firmware waking vector */
        acpi_set_firmware_waking_vector((acpi_physical_address) 0);
- 
-       if (init_8259A_after_S1) {
-               printk("Broken toshiba laptop -> kicking interrupts\n");
-               init_8259A(0);
-       }
  }
  
 +static int acpi_hibernation_pre_restore(void)
 +{
 +      acpi_status status;
 +
 +      status = acpi_hw_disable_all_gpes();
 +
 +      return ACPI_SUCCESS(status) ? 0 : -EFAULT;
 +}
 +
 +static void acpi_hibernation_restore_cleanup(void)
 +{
 +      acpi_hw_enable_all_runtime_gpes();
 +}
 +
  static struct hibernation_ops acpi_hibernation_ops = {
        .prepare = acpi_hibernation_prepare,
        .enter = acpi_hibernation_enter,

diff --cc include/acpi/acmacros.h
Simple merge