diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 23:55:35 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 23:55:35 +0200 |
| commit | 91af125c33af02340355b96a6ed0761e5132cde0 (patch) | |
| tree | c946115b4215c95c91bc18e26fe41daa12ebdb44 /include/uapi/linux/agpgart.h | |
| parent | 805c52815825b1ed2e3249508ce5ffa5aeae5d1d (diff) | |
| parent | e70dba6020eaaceb1d3619dfb535c719900c7091 (diff) | |
| parent | 85dbb3d05ec6d063f6f8ad4d6dfc13793d566374 (diff) | |
Merge branches 'acpi-pnp' and 'acpi-pci'
* acpi-pnp:
ACPI / PNP: Use ACPI_COMPANION() instead of ACPI_HANDLE()
ACPI / PNP: do ACPI binding directly
* acpi-pci:
ACPI / PCI: Use ACPI_COMPANION() instead of ACPI_HANDLE()