From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 20 Mar 2014 12:25:16 +0000 (+0100)
Subject: Merge branches 'misc' and 'powercap'
X-Git-Tag: firefly_0821_release~176^2~4176^2~10
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=cb97def86446201d9135090615d8c08f9669d338;p=firefly-linux-kernel-4.4.55.git

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
---

cb97def86446201d9135090615d8c08f9669d338