Merge branch 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 13 Feb 2014 01:12:41 +0000 (02:12 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 13 Feb 2014 01:12:41 +0000 (02:12 +0100)
commit465e5fc41dbeeb5331bbff6e9e734f0542dfc739
treeaeb7cc9a2ebc9858d0214ce555f8ffe12ea90adf
parentd990ce0d5be15664546c12ef0bc63fab33f31aa3
parent171d0ba869675dac9acbbb9f1966c54359e5aac8
Merge branch 'pm-cpufreq'

* pm-cpufreq:
  MAINTAINERS / cpufreq: update Sudeep's email address
  intel_pstate: Remove energy reporting from pstate_sample tracepoint