diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-26 00:40:25 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-26 00:40:25 +0200 |
| commit | d4c9c8a09cff85f69b2c224ca7dbeb42431da2b3 (patch) | |
| tree | 7bcb901a64d9521c1f235b80972edbe1094fb95b /drivers | |
| parent | e38ed294298089362a224a3f601efe6a49d1a763 (diff) | |
| parent | cb171f7abb9a1a250fb41d088b81799f75bd1357 (diff) | |
| parent | f66abe92ce498672ac44d550f51a526597c731c4 (diff) | |
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