Merge branches 'pnp' and 'acpi-hotplug'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 25 Apr 2014 22:40:25 +0000 (00:40 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 25 Apr 2014 22:40:25 +0000 (00:40 +0200)
commitd4c9c8a09cff85f69b2c224ca7dbeb42431da2b3
tree7bcb901a64d9521c1f235b80972edbe1094fb95b
parente38ed294298089362a224a3f601efe6a49d1a763
parentcb171f7abb9a1a250fb41d088b81799f75bd1357
parentf66abe92ce498672ac44d550f51a526597c731c4
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