Merge branch 'linus' into release

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/ia64/kernel/acpi.c
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
index 39ae3d0e3a4a7e0cf6521bbbea5bd05058e152cd,29dc0c89d4afc076654a5f62c1056c219944f156..d37593c2f438d80ff609ed61e0584032670db260
--- 1/arch/x86/kernel/acpi/boot.c
--- 2/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@@ -1359,18 -1374,18 +1374,29 @@@ static void __init acpi_process_madt(vo
                               "Invalid BIOS MADT, disabling ACPI\n");
                        disable_acpi();
                }
 +      } else {
 +              /*
 +               * ACPI found no MADT, and so ACPI wants UP PIC mode.
 +               * In the event an MPS table was found, forget it.
 +               * Boot with "acpi=off" to use MPS on such a system.
 +               */
 +              if (smp_found_config) {
 +                      printk(KERN_WARNING PREFIX
 +                              "No APIC-table, disabling MPS\n");
 +                      smp_found_config = 0;
 +              }
        }
+ 
+       /*
+        * ACPI supports both logical (e.g. Hyper-Threading) and physical
+        * processors, where MPS only supports physical.
+        */
+       if (acpi_lapic && acpi_ioapic)
+               printk(KERN_INFO "Using ACPI (MADT) for SMP configuration "
+                      "information\n");
+       else if (acpi_lapic)
+               printk(KERN_INFO "Using ACPI for processor (LAPIC) "
+                      "configuration information\n");
  #endif
        return;
  }

diff --cc arch/x86/kernel/e820.c
Simple merge

diff --cc drivers/acpi/acpica/acmacros.h
Simple merge

diff --cc drivers/acpi/acpica/exprep.c
Simple merge

diff --cc drivers/acpi/acpica/exresolv.c
Simple merge

diff --cc drivers/acpi/acpica/exstore.c
Simple merge

diff --cc drivers/acpi/acpica/rscreate.c
Simple merge

diff --cc drivers/acpi/acpica/utobject.c
Simple merge

diff --cc drivers/ata/libata-acpi.c
Simple merge

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

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/pci/hotplug/acpi_pcihp.c
Simple merge

diff --cc drivers/pci/hotplug/pciehp.h
index 7072952ea1d28b6337ccc302a8b4d11b470fc1c6,27fd18f019f8e9d3447d8ce4a786de2b6a556095..db85284ffb621a98d93252f8c6d6069aa43fb006
--- 1/drivers/pci/hotplug/pciehp.h
--- 2/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@@ -217,13 -217,26 +217,25 @@@ struct hpc_ops 
  #ifdef CONFIG_ACPI
  #include <acpi/acpi.h>
  #include <acpi/acpi_bus.h>
 -#include <acpi/actypes.h>
  #include <linux/pci-acpi.h>
  
+ extern void __init pciehp_acpi_slot_detection_init(void);
+ extern int pciehp_acpi_slot_detection_check(struct pci_dev *dev);
+ 
+ static inline void pciehp_firmware_init(void)
+ {
+       pciehp_acpi_slot_detection_init();
+ }
+ 
  static inline int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
  {
+       int retval;
        u32 flags = (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |
                     OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
-       return acpi_get_hp_hw_control_from_firmware(dev, flags);
+       retval = acpi_get_hp_hw_control_from_firmware(dev, flags);
+       if (retval)
+               return retval;
+       return pciehp_acpi_slot_detection_check(dev);
  }
  
  static inline int pciehp_get_hp_params_from_firmware(struct pci_dev *dev,

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

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

diff --cc include/linux/pci_hotplug.h
Simple merge

diff --cc kernel/power/disk.c
index 096fe4899ea4b40f2783c32da6cf8be43048a208,f77d3819ef57b2407012fbbf431f27add286fe91..45e8541ab7e3ee0b699142ed20094b817bdd8255
--- 1/kernel/power/disk.c
--- 2/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@@ -257,9 -256,10 +256,9 @@@ static int create_image(int platform_mo
  
  int hibernation_snapshot(int platform_mode)
  {
-       int error, ftrace_save;
+       int error;
  
 -      /* Free memory before shutting down devices. */
 -      error = swsusp_shrink_memory();
 +      error = platform_begin(platform_mode);
        if (error)
                return error;