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 /drivers/acpi | |
| parent | 380062bd66dc65287a3e9f937bc0dee2c434d25d (diff) | |
| parent | 73f7d1ca32638028e3271f54616773727e2f9f26 (diff) | |
| parent | 00159a2013269bc0a617de885e4b921349192bd0 (diff) | |
| download | blackbird-op-linux-8341ecc9f4eb7513951bd1986d78185a11ac6d4e.tar.gz blackbird-op-linux-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
