]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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)
* pnp:
  PNP: Work around BIOS defects in Intel MCH area reporting

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


Trivial merge