summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-14 14:20:57 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-14 14:20:57 +0100
commit02fd4e76a62f4e7fe6cfc38b2bf1f693d29e8184 (patch)
tree5609708bb07a26b4e70f2cda6123273283f39d10 /drivers/acpi
parentMerge branches 'acpi-processor' and 'acpi-cppc' (diff)
parentx86/ACPI/PCI: Recognize that Interrupt Line 255 means "not connected" (diff)
parenti2c: designware: Add device HID for future AMD I2C controller (diff)
parentPNP / ACPI: add ACPI_RESOURCE_TYPE_SERIAL_BUS as a valid type (diff)
downloadlinux-02fd4e76a62f4e7fe6cfc38b2bf1f693d29e8184.tar.xz
linux-02fd4e76a62f4e7fe6cfc38b2bf1f693d29e8184.zip
Merge branches 'acpi-pci', 'acpi-soc' and 'pnp'
* acpi-pci: x86/ACPI/PCI: Recognize that Interrupt Line 255 means "not connected" * acpi-soc: i2c: designware: Add device HID for future AMD I2C controller * pnp: PNP / ACPI: add ACPI_RESOURCE_TYPE_SERIAL_BUS as a valid type