diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-03-25 00:59:41 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-03-25 00:59:41 +0100 |
commit | ee0140dc8ffc89bdc7b74a858089d5a75a654b4a (patch) | |
tree | 4aeb4dedc56684b7575bb32dbecc114d4347d203 /drivers | |
parent | 3513ac743df4a8522270bde4a20d75a42874487e (diff) | |
parent | f5eda99ee6c0c3e85be9d6f20685151514d5102f (diff) | |
parent | 4a798f508f5d0809f45c939e329e17b3eb0ffbc1 (diff) | |
parent | 4a2e7aab4ffce1e0e79b303dc2f9a03aa9f3a332 (diff) | |
parent | bf4703fdd166fffd5b2e4c42d2ebbf708b94748e (diff) | |
download | linux-ee0140dc8ffc89bdc7b74a858089d5a75a654b4a.tar.bz2 |
Merge branches 'acpi-soc', 'acpi-misc', 'acpi-pci' and 'device-properties'
* acpi-soc:
ACPI / APD: Add device HID for future AMD UART controller
* acpi-misc:
ACPI / util: cast data to u64 before shifting to fix sign extension
* acpi-pci:
PCI: ACPI: IA64: fix IO port generic range check
* device-properties:
ACPI / property: fix data node parsing in acpi_get_next_subnode()