Merge branch 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 Jan 2016 00:12:40 +0000 (01:12 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 Jan 2016 00:12:40 +0000 (01:12 +0100)
* powercap:
  powercap: constify powercap_zone_ops and powercap_zone_constraint_ops structures

1  2 
drivers/powercap/intel_rapl.c

Simple merge