diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-29 10:37:23 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-29 10:37:23 -0700 |
| commit | 590e935df0c94b2d7a4584bb26906666176a6133 (patch) | |
| tree | bb004c31d277423c7eb0f6bd2c0c1e9d8428e9f2 /MAINTAINERS | |
| parent | 774b195c03ac44c0dbc4e81a3f194779692ce3bd (diff) | |
| parent | 91760bceff1f3f5860ff49c14194567f972352e6 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rtlsk-v3.18-16.01-rtlsk-v3.18-15.12-rtlsk-v3.18-15.11-rtlsk-v3.18-15.10-rtlsk-v3.18-15.09-rtlsk-v3.18-15.08-rtlsk-v3.18-15.07-rt
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 636c5abec933..0c921c86609a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9305,6 +9305,7 @@ Q: https://patchwork.kernel.org/project/linux-pm/list/ S: Supported F: drivers/thermal/ F: include/linux/thermal.h +F: include/uapi/linux/thermal.h F: include/linux/cpu_cooling.h F: Documentation/devicetree/bindings/thermal/ |