diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 11:57:37 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 11:57:37 +1100 |
| commit | e0e8fc3148e0e142079611f82089258fb3b46f00 (patch) | |
| tree | eb8f676702d0656168897b6f9d366b2d3c7a3382 /MAINTAINERS | |
| parent | 7e2f87b03289e2094955559a4e59a367f5c2afb4 (diff) | |
| parent | c698a4492f01127ca90fc28cd5157f3d616fe4ff (diff) | |
Merge remote-tracking branch 'thermal/next'
Conflicts:
drivers/cpufreq/Kconfig
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fa64677c05c9..05b0914a00c3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8617,6 +8617,7 @@ S: Supported F: drivers/thermal/ F: include/linux/thermal.h F: include/linux/cpu_cooling.h +F: Documentation/devicetree/bindings/thermal/ THINGM BLINK(1) USB RGB LED DRIVER M: Vivien Didelot <vivien.didelot@savoirfairelinux.com> |