Merge branches 'acpi-general' and 'acpi-video'

* acpi-general:
  ACPI: Fix bug when ACPI reset register is implemented in system memory

* acpi-video:
  ACPI / video: Change the default for video.use_native_backlight to 1

diff --cc drivers/acpi/osl.c
index 147bc1b91b4214fd0f7dd7e0ae1c840e371309eb,88cddf84d245dd2a9154b3f92761e99fa3e63c26,6776c599816f33100a2403ae7286e534f0a96354..3f2bdc812d23b7c2b4175448793eb56c96af2b47
--- 1/drivers/acpi/osl.c
--- 2/drivers/acpi/osl.c
--- 3/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@@@ -1783,15 -1770,16 -1770,16 +1783,15 @@@@ acpi_status acpi_os_release_object(acpi
   }
   #endif
   
 --static int __init acpi_no_auto_ssdt_setup(char *s)
 ++static int __init acpi_no_static_ssdt_setup(char *s)
   {
 --        printk(KERN_NOTICE PREFIX "SSDT auto-load disabled\n");
  -
  -        acpi_gbl_disable_ssdt_table_load = TRUE;
 ++     acpi_gbl_disable_ssdt_table_install = TRUE;
 ++     pr_info("ACPI: static SSDT installation disabled\n");
   
 -         acpi_gbl_disable_ssdt_table_load = TRUE;
 - 
 --        return 1;
 ++     return 0;
   }
   
 --__setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup);
 ++early_param("acpi_no_static_ssdt", acpi_no_static_ssdt_setup);
   
   static int __init acpi_disable_return_repair(char *s)
   {