diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-21 16:53:28 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-21 16:53:28 +0100 |
| commit | 884411d9a580814910bc21dc08e2495efc4b1491 (patch) | |
| tree | 2201bf0c3d2b14f7e6505001300604e6a0164b5c /fs/nfs/nfstrace.h | |
| parent | 5a2d853ffcf961d6b7d491858946878676aeae3e (diff) | |
| parent | 38953d3945aedf8e198b75ff09b22e369f14566f (diff) | |
Merge branch 'acpi-processor'
* acpi-processor:
ACPI: Move BAD_MADT_ENTRY() to linux/acpi.h
ACPI / processor: Make it possible to get APIC ID via GIC
ACPI / processor: Build idle_boot_override on x86 and ia64
ACPI / processor: Use ACPI_PROCESSOR_DEVICE_HID instead of "ACPI0007"
ACPI / processor: Fix acpi_processor_eval_pdc() return value type
Diffstat (limited to 'fs/nfs/nfstrace.h')
0 files changed, 0 insertions, 0 deletions