diff options
author | Zhang Rui <rui.zhang@intel.com> | 2013-04-27 12:48:57 (GMT) |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2013-04-27 12:48:57 (GMT) |
commit | de6558dc964f6a3243218f17d8032ad810864e2b (patch) | |
tree | 7ad5494dee620df39aedd05348129f223a1d3bab | |
parent | 8f578bfefdd13d28d5baf3345405c46b101fe2f5 (diff) | |
parent | cfaf71792d052dcbae379ce1ed6d11b8ce8ebab4 (diff) | |
download | linux-fsl-qoriq-de6558dc964f6a3243218f17d8032ad810864e2b.tar.xz |
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 4cf5fd3..743d540 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7898,11 +7898,14 @@ F: arch/xtensa/ THERMAL M: Zhang Rui <rui.zhang@intel.com> +M: Eduardo Valentin <eduardo.valentin@ti.com> L: linux-pm@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git +Q: https://patchwork.kernel.org/project/linux-pm/list/ S: Supported F: drivers/thermal/ F: include/linux/thermal.h +F: include/linux/cpu_cooling.h THINGM BLINK(1) USB RGB LED DRIVER M: Vivien Didelot <vivien.didelot@savoirfairelinux.com> |