diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-17 01:57:26 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-17 01:57:26 +0100 |
| commit | 8341ecc9f4eb7513951bd1986d78185a11ac6d4e (patch) | |
| tree | 62dfc55d44cf222c753712a05b07f0046cadf381 /scripts | |
| parent | Merge branch 'pm-clk' (diff) | |
| parent | ACPI / init: Run acpi_early_init() before timekeeping_init() (diff) | |
| parent | ACPI / memhotplug: add parameter to disable memory hotplug (diff) | |
| download | linux-dev-8341ecc9f4eb7513951bd1986d78185a11ac6d4e.tar.xz linux-dev-8341ecc9f4eb7513951bd1986d78185a11ac6d4e.zip | |
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