diff options
| author | Rafael J. Wysocki | 2015-05-15 00:31:23 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2015-05-15 00:31:23 +0200 |
| commit | 4de5167ee07f7a9b66d999e40f2c3193d1a08add (patch) | |
| tree | 6458e3c033ace5f623046b92f90be9408db5deec /drivers/ide/ide-disk.h | |
| parent | b9a5e5e18fbf223502c0b2264c15024e393da928 (diff) | |
| parent | ff284f37fc0e6f3b51ede85c5944d571b640ac0f (diff) | |
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'."
Diffstat (limited to 'drivers/ide/ide-disk.h')
0 files changed, 0 insertions, 0 deletions