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)
commit4c170ed1d9d66464361cb47853ffb9fa64ca5048
treed8d26a3368017aa682508fc3f96fc8071862aabd
parent476cc4333afb7cf3232c066d278c024b186e6d17
parent38a234b9f08883bbcb475b798e0a3d6b44bd37d7
parente0f03e87fc6f27a8af9896f430f2945b3b1664c0
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