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 /fs/jbd2/commit.c | |
| parent | Merge branches 'pm-sleep', 'pm-cpuidle' and 'pm-cpufreq' (diff) | |
| parent | PNP: Work around BIOS defects in Intel MCH area reporting (diff) | |
| parent | ACPI / notify: Do not block unknown type notifications in root handler (diff) | |
| download | linux-dev-d4c9c8a09cff85f69b2c224ca7dbeb42431da2b3.tar.xz linux-dev-d4c9c8a09cff85f69b2c224ca7dbeb42431da2b3.zip | |
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