From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 14 Jun 2016 23:37:21 +0000 (+0200)
Subject: Merge back earlier powercap material for v4.8.
X-Git-Tag: v4.8-rc1~158^2~1^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a8165a21b711c365d19a3ddb6338e2f84e44e33e;p=linux.git

Merge back earlier powercap material for v4.8.
---

a8165a21b711c365d19a3ddb6338e2f84e44e33e