Merge branches 'acpi-init' and 'acpi-hotplug'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Jan 2014 00:57:26 +0000 (01:57 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Jan 2014 00:57:26 +0000 (01:57 +0100)
* acpi-init:
  ACPI / init: Run acpi_early_init() before timekeeping_init()

* acpi-hotplug:
  ACPI / memhotplug: add parameter to disable memory hotplug

1  2  3 
Documentation/kernel-parameters.txt

Simple merge