Merge back earlier powercap material for v4.8.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 14 Jun 2016 23:37:21 +0000 (01:37 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 14 Jun 2016 23:37:21 +0000 (01:37 +0200)
1  2 
drivers/powercap/intel_rapl.c

Simple merge