Merge branches 'release' and 'dsdt-override' into release

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

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/acpi/osl.c
index c2c585366fa6957ed2b51d9b9b0f3dbeafb5f9fe,2a400e08e74ceda77489d92b180a12815e888546..27ccd68b8f462de790a7243219197e4631b8fcf9
--- 1/drivers/acpi/osl.c
--- 2/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@@ -347,17 -410,18 +427,26 @@@ acpi_os_table_override(struct acpi_tabl
        return AE_OK;
  }
  
+ #ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
+ int __init acpi_no_initrd_override_setup(char *s)
+ {
+       acpi_no_initrd_override = 1;
+       return 1;
+ }
+ __setup("acpi_no_initrd_override", acpi_no_initrd_override_setup);
+ #endif
+ 
  static irqreturn_t acpi_irq(int irq, void *dev_id)
  {
 -      return (*acpi_irq_handler) (acpi_irq_context) ? IRQ_HANDLED : IRQ_NONE;
 +      u32 handled;
 +
 +      handled = (*acpi_irq_handler) (acpi_irq_context);
 +
 +      if (handled) {
 +              acpi_irq_handled++;
 +              return IRQ_HANDLED;
 +      } else
 +              return IRQ_NONE;
  }
  
  acpi_status