summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-12 01:10:36 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-12 01:10:36 +0100
commit4c170ed1d9d66464361cb47853ffb9fa64ca5048 (patch)
treed8d26a3368017aa682508fc3f96fc8071862aabd /drivers
parent476cc4333afb7cf3232c066d278c024b186e6d17 (diff)
parent38a234b9f08883bbcb475b798e0a3d6b44bd37d7 (diff)
parente0f03e87fc6f27a8af9896f430f2945b3b1664c0 (diff)
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