Merge branches 'acpi-general' and 'acpi-video'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 12 Jun 2014 11:42:37 +0000 (13:42 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 12 Jun 2014 11:42:37 +0000 (13:42 +0200)
commitde815a6d00da0f8a59e8aebf8efe12e289552a8f
tree1dd778c502c12720c925ce9e2df5e982965c4fe6
parent9d674f2107b7dc801db9780f5f6b645f4905372f
parenta4714a898e85205e1118ec923cde43d88eb105f6
parent751109aad5834375ca9ed0dcfcd85a00cbf872b5
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
drivers/acpi/osl.c