diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-12 01:10:36 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-12 01:10:36 +0100 |
| commit | 4c170ed1d9d66464361cb47853ffb9fa64ca5048 (patch) | |
| tree | d8d26a3368017aa682508fc3f96fc8071862aabd /drivers | |
| parent | Merge branches 'acpi-pci', 'acpi-irq' and 'acpi-assorted' (diff) | |
| parent | ACPI / PNP: constify device IDs (diff) | |
| parent | PNP: respect PNP_DRIVER_RES_DO_NOT_CHANGE when detaching (diff) | |
| download | linux-dev-4c170ed1d9d66464361cb47853ffb9fa64ca5048.tar.xz linux-dev-4c170ed1d9d66464361cb47853ffb9fa64ca5048.zip | |
Merge branches 'acpi-pnp' and 'pnp'
* acpi-pnp:
ACPI / PNP: constify device IDs
* pnp:
PNP: respect PNP_DRIVER_RES_DO_NOT_CHANGE when detaching
PNP: Add Broadwell to Intel MCH size workaround