diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-08-05 16:50:00 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-08-05 16:50:00 -0400 |
| commit | 49c68fd448568e79598b159efc09a7864bc59ede (patch) | |
| tree | 73bf19a7bc21c461a9c83dc57853f528db21c366 /MAINTAINERS | |
| parent | ddbe8db147cd0954da93dc6986f4793bcabb3889 (diff) | |
| parent | 059802f961db9717412b6958111ca1cd1865726e (diff) | |
Merge branch 'pm-tools'
* pm-tools:
cpupower: Remove redundant error check
cpupower: bench: parse.c: Fix several minor errors
cpupower: mperf monitor: Correct use of ! and &
cpupower: Adjust MAINTAINERS file
PM / tools: cpupower: drop negativity check on unsigned value
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c04b14898249..a221b427630b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2521,8 +2521,8 @@ F: arch/x86/kernel/cpuid.c | |||
| 2521 | F: arch/x86/kernel/msr.c | 2521 | F: arch/x86/kernel/msr.c |
| 2522 | 2522 | ||
| 2523 | CPU POWER MONITORING SUBSYSTEM | 2523 | CPU POWER MONITORING SUBSYSTEM |
| 2524 | M: Dominik Brodowski <linux@dominikbrodowski.net> | ||
| 2525 | M: Thomas Renninger <trenn@suse.de> | 2524 | M: Thomas Renninger <trenn@suse.de> |
| 2525 | L: linux-pm@vger.kernel.org | ||
| 2526 | S: Maintained | 2526 | S: Maintained |
| 2527 | F: tools/power/cpupower/ | 2527 | F: tools/power/cpupower/ |
| 2528 | 2528 | ||