diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-13 01:12:41 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-13 01:12:41 (GMT) |
commit | 465e5fc41dbeeb5331bbff6e9e734f0542dfc739 (patch) | |
tree | aeb7cc9a2ebc9858d0214ce555f8ffe12ea90adf /MAINTAINERS | |
parent | d990ce0d5be15664546c12ef0bc63fab33f31aa3 (diff) | |
parent | 171d0ba869675dac9acbbb9f1966c54359e5aac8 (diff) | |
download | linux-465e5fc41dbeeb5331bbff6e9e734f0542dfc739.tar.xz |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
MAINTAINERS / cpufreq: update Sudeep's email address
intel_pstate: Remove energy reporting from pstate_sample tracepoint
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b2cf5cf..956f069 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2367,7 +2367,7 @@ F: include/linux/cpufreq.h CPU FREQUENCY DRIVERS - ARM BIG LITTLE M: Viresh Kumar <viresh.kumar@linaro.org> -M: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com> +M: Sudeep Holla <sudeep.holla@arm.com> L: cpufreq@vger.kernel.org L: linux-pm@vger.kernel.org W: http://www.arm.com/products/processors/technologies/biglittleprocessing.php |