Merge branches 'misc' and 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Mar 2014 12:25:16 +0000 (13:25 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Mar 2014 12:25:16 +0000 (13:25 +0100)
commitcb97def86446201d9135090615d8c08f9669d338
treeefa6e63440dfde29724d02150b871432a7496c05
parent6ac4a2ab16af49a86ad16bdab1de72d5b809a9c1
parent7fb060820acbc55eeab342d1ce6cdffc80797478
parentd6b2e6d09aa18738dd29277617a186fa827bd7e1
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