From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 12 Jan 2016 00:10:36 +0000 (+0100)
Subject: Merge branches 'acpi-pnp' and 'pnp'
X-Git-Tag: v4.5-rc1~125^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c170ed1d9d66464361cb47853ffb9fa64ca5048;p=thirdparty%2Flinux.git

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
---

4c170ed1d9d66464361cb47853ffb9fa64ca5048