diff options
author | Zhang Rui <rui.zhang@intel.com> | 2013-04-27 08:48:57 -0400 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2013-04-27 08:48:57 -0400 |
commit | de6558dc964f6a3243218f17d8032ad810864e2b (patch) | |
tree | 7ad5494dee620df39aedd05348129f223a1d3bab | |
parent | 8f578bfefdd13d28d5baf3345405c46b101fe2f5 (diff) | |
parent | cfaf71792d052dcbae379ce1ed6d11b8ce8ebab4 (diff) |
Merge branch 'MAINTAINERS-update' of .git into next
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4cf5fd334a06..743d540f5db4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -7898,11 +7898,14 @@ F: arch/xtensa/ | |||
7898 | 7898 | ||
7899 | THERMAL | 7899 | THERMAL |
7900 | M: Zhang Rui <rui.zhang@intel.com> | 7900 | M: Zhang Rui <rui.zhang@intel.com> |
7901 | M: Eduardo Valentin <eduardo.valentin@ti.com> | ||
7901 | L: linux-pm@vger.kernel.org | 7902 | L: linux-pm@vger.kernel.org |
7902 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git | 7903 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git |
7904 | Q: https://patchwork.kernel.org/project/linux-pm/list/ | ||
7903 | S: Supported | 7905 | S: Supported |
7904 | F: drivers/thermal/ | 7906 | F: drivers/thermal/ |
7905 | F: include/linux/thermal.h | 7907 | F: include/linux/thermal.h |
7908 | F: include/linux/cpu_cooling.h | ||
7906 | 7909 | ||
7907 | THINGM BLINK(1) USB RGB LED DRIVER | 7910 | THINGM BLINK(1) USB RGB LED DRIVER |
7908 | M: Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 7911 | M: Vivien Didelot <vivien.didelot@savoirfairelinux.com> |