]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branches 'acpi-pnp' and 'pnp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 Jan 2016 00:10:36 +0000 (01:10 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 Jan 2016 00:10:36 +0000 (01:10 +0100)
* 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


Trivial merge