diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 12:22:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 12:22:42 +1000 |
| commit | fa29e481c8e07f993fbc14d4c2e957ae71a865e2 (patch) | |
| tree | b80e672b3297b0f8ef0c06fd5325772c0ac83a24 /MAINTAINERS | |
| parent | cd3c4bcc31d43cd6b1919918b27d5fa5bd644253 (diff) | |
| parent | 04ea29ef83d8e88f172023b3947fe76268ca7347 (diff) | |
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
drivers/acpi/acpi_extlog.c
drivers/cpuidle/Kconfig.arm
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3b5ee1b06c08..2f867daffed7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2547,8 +2547,8 @@ F: arch/x86/kernel/cpuid.c F: arch/x86/kernel/msr.c CPU POWER MONITORING SUBSYSTEM -M: Dominik Brodowski <linux@dominikbrodowski.net> M: Thomas Renninger <trenn@suse.de> +L: linux-pm@vger.kernel.org S: Maintained F: tools/power/cpupower/ @@ -7075,8 +7075,10 @@ F: include/linux/timer* F: kernel/*timer* POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS +M: Sebastian Reichel <sre@kernel.org> M: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> M: David Woodhouse <dwmw2@infradead.org> +L: linux-pm@vger.kernel.org T: git git://git.infradead.org/battery-2.6.git S: Maintained F: include/linux/power_supply.h |