diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-03-14 14:20:57 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-03-14 14:20:57 +0100 |
| commit | 02fd4e76a62f4e7fe6cfc38b2bf1f693d29e8184 (patch) | |
| tree | 5609708bb07a26b4e70f2cda6123273283f39d10 /kernel | |
| parent | 6a8ccb1dfd0452a68e1ce0a2bf67ff5b90ebd2a6 (diff) | |
| parent | e237a5518425155faa508a087f28269f58074b92 (diff) | |
| parent | e4e666ba74d4f6eff04d3c567b9f2d50a46837e4 (diff) | |
| parent | 86e75410f067e4ff09d6a94d6bb6800ec956ccfe (diff) | |
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