From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 13 Feb 2014 01:12:41 +0000 (+0100)
Subject: Merge branch 'pm-cpufreq'
X-Git-Tag: v4.13~7862^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=465e5fc41dbeeb5331bbff6e9e734f0542dfc739;p=mirror_ubuntu-bionic-kernel.git

Merge branch 'pm-cpufreq'

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

465e5fc41dbeeb5331bbff6e9e734f0542dfc739