diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 12:02:22 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 12:02:22 +1000 |
| commit | 60b6cd143de65ab18b11a86e9ce376432de2fe84 (patch) | |
| tree | f579a2abf4d5f4205e2147e750f28b428d27376c /MAINTAINERS | |
| parent | 6e4dc2e1c1c240118aad46220b5a3d46322effa6 (diff) | |
| parent | d67e1cc8509b161b391c48cb9e13fad7da86499b (diff) | |
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
drivers/cpufreq/exynos-cpufreq.c
drivers/cpufreq/exynos-cpufreq.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9ec0e61266c..11c71a94b20 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2404,7 +2404,6 @@ F: drivers/net/ethernet/ti/cpmac.c CPU FREQUENCY DRIVERS M: Rafael J. Wysocki <rjw@rjwysocki.net> M: Viresh Kumar <viresh.kumar@linaro.org> -L: cpufreq@vger.kernel.org L: linux-pm@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git @@ -2415,7 +2414,6 @@ F: include/linux/cpufreq.h CPU FREQUENCY DRIVERS - ARM BIG LITTLE M: Viresh Kumar <viresh.kumar@linaro.org> 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 S: Maintained @@ -6944,7 +6942,6 @@ F: drivers/power/ PNP SUPPORT M: Rafael J. Wysocki <rafael.j.wysocki@intel.com> -M: Bjorn Helgaas <bhelgaas@google.com> S: Maintained F: drivers/pnp/ |