]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1a9c936b6df569d9dba1f215831155d574d459c8
treeefa6e63440dfde29724d02150b871432a7496c05
parentf5628bc9d20f8b483a4109ed1f2995702a91bf84
parentb755c6ed9c223faab54298ad5af1da414b52ce7d
parentbdc1d3e8155a2b9f13c3999e04a60d8180668a4b
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