summaryrefslogtreecommitdiff
path: root/drivers/staging/lustre/Makefile
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-16 16:45:48 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-16 16:45:48 +0200
commitfc723957801465c4a911d0a509709f0f8b91aa8a (patch)
treebfbd50df01d35981c6c93ac2ba7d8d3754fbaf9e /drivers/staging/lustre/Makefile
parentefc499f9807bfc179c66b7c3524e30370c6fd1b1 (diff)
parent9e5ed6d1fb87dc3ff0c2a94ed75fe82027a9f597 (diff)
parentf18ebc211e259d4f591e39e74b2aa2de226c9a1d (diff)
parent60438d9a1ef4176d79739efadee122afe92904b8 (diff)
Merge branches 'acpi-pci', 'acpi-misc' and 'acpi-tools'
* acpi-pci: ACPI,PCI,IRQ: remove SCI penalize function ACPI,PCI,IRQ: remove redundant code in acpi_irq_penalty_init() ACPI,PCI,IRQ: reduce static IRQ array size to 16 ACPI,PCI,IRQ: reduce resource requirements * acpi-misc: ACPI / sysfs: fix error code in get_status() ACPI / device_sysfs: Clean up checkpatch errors ACPI / device_sysfs: Change _SUN and _STA show functions error return to EIO ACPI / device_sysfs: Add sysfs support for _HRV hardware revision arm64: defconfig: Enable ACPI ACPI / ARM64: Remove EXPERT dependency for ACPI on ARM64 ACPI / ARM64: Don't enable ACPI by default on ARM64 acer-wmi: Use acpi_dev_found() eeepc-wmi: Use acpi_dev_found() ACPI / utils: Rename acpi_dev_present() * acpi-tools: tools/power/acpi: close file only if it is open