From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 14 Mar 2016 13:20:57 +0000 (+0100)
Subject: Merge branches 'acpi-pci', 'acpi-soc' and 'pnp'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=02fd4e76a62f4e7fe6cfc38b2bf1f693d29e8184;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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
---

02fd4e76a62f4e7fe6cfc38b2bf1f693d29e8184