From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 17 Jan 2014 00:57:26 +0000 (+0100)
Subject: Merge branches 'acpi-init' and 'acpi-hotplug'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8341ecc9f4eb7513951bd1986d78185a11ac6d4e;p=linux.git

Merge branches 'acpi-init' and 'acpi-hotplug'

* acpi-init:
  ACPI / init: Run acpi_early_init() before timekeeping_init()

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

8341ecc9f4eb7513951bd1986d78185a11ac6d4e