From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 25 Apr 2014 22:40:25 +0000 (+0200)
Subject: Merge branches 'pnp' and 'acpi-hotplug'
X-Git-Tag: v3.15-rc3~11^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d4c9c8a09cff85f69b2c224ca7dbeb42431da2b3;p=linux.git

Merge branches 'pnp' and 'acpi-hotplug'

* pnp:
  PNP: Work around BIOS defects in Intel MCH area reporting

* acpi-hotplug:
  ACPI / notify: Do not block unknown type notifications in root handler
---

d4c9c8a09cff85f69b2c224ca7dbeb42431da2b3