Merge branches 'acpi-init' and 'acpica'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 14 May 2015 22:31:23 +0000 (00:31 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 14 May 2015 22:31:23 +0000 (00:31 +0200)
commit4de5167ee07f7a9b66d999e40f2c3193d1a08add
tree6458e3c033ace5f623046b92f90be9408db5deec
parentb9a5e5e18fbf223502c0b2264c15024e393da928
parentff284f37fc0e6f3b51ede85c5944d571b640ac0f
Merge branches 'acpi-init' and 'acpica'

* acpi-init:
  ACPI / init: Fix the ordering of acpi_reserve_resources()

* acpica:
  Revert "ACPICA: Permanently set _REV to the value '2'."