diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-20 13:25:16 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-20 13:25:16 +0100 |
| commit | cb97def86446201d9135090615d8c08f9669d338 (patch) | |
| tree | efa6e63440dfde29724d02150b871432a7496c05 /kernel | |
| parent | Merge branch 'acpica' (diff) | |
| parent | MAINTAINERS: Reorder maintainer addresses for PM and ACPI (diff) | |
| parent | powercap / intel_rapl: spell out SoC names (diff) | |
| download | linux-cb97def86446201d9135090615d8c08f9669d338.tar.xz linux-cb97def86446201d9135090615d8c08f9669d338.zip | |
Merge branches 'misc' and 'powercap'
* misc:
MAINTAINERS: Reorder maintainer addresses for PM and ACPI
* powercap:
powercap / intel_rapl: spell out SoC names
powercap / intel_rapl: relax sanity check on energy counters