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 /drivers/mtd | |
| parent | 6ac4a2ab16af49a86ad16bdab1de72d5b809a9c1 (diff) | |
| parent | 7fb060820acbc55eeab342d1ce6cdffc80797478 (diff) | |
| parent | d6b2e6d09aa18738dd29277617a186fa827bd7e1 (diff) | |
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