diff options
| author | Linaro CI <ci_notify@linaro.org> | 2017-09-05 07:14:11 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2017-09-05 07:14:11 +0000 |
| commit | 683a6addcc5e6a7335b976bcd057aaf34e59b564 (patch) | |
| tree | 312e8d9ba0d631d1dcb41153369adbe4e555beee /MAINTAINERS | |
| parent | 52a514b195753ff65c663f9985b423eeae7c47cb (diff) | |
| parent | bd0d13e8aa63a71e5e294356556888d79587a2d1 (diff) | |
Merge remote-tracking branch 'sumit-lts/lts-4.4.y-hikey' into linux-4.4.y4.4.87-rc1-hikey-20170905
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ab65bbecb159..c40ab482dd3e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3705,6 +3705,16 @@ S: Maintained F: drivers/gpu/drm/gma500 F: include/drm/gma500* +DRM DRIVERS FOR HISILICON +M: Xinliang Liu <z.liuxinliang@hisilicon.com> +R: Xinwei Kong <kong.kongxinwei@hisilicon.com> +R: Chen Feng <puck.chen@hisilicon.com> +L: dri-devel@lists.freedesktop.org +T: git git://github.com/xin3liang/linux.git +S: Maintained +F: drivers/gpu/drm/hisilicon/ +F: Documentation/devicetree/bindings/display/hisilicon/ + DRM DRIVERS FOR NVIDIA TEGRA M: Thierry Reding <thierry.reding@gmail.com> M: Terje Bergström <tbergstrom@nvidia.com> @@ -7935,6 +7945,11 @@ F: arch/*/oprofile/ F: drivers/oprofile/ F: include/linux/oprofile.h +OP-TEE DRIVER +M: Jens Wiklander <jens.wiklander@linaro.org> +S: Maintained +F: drivers/tee/optee/ + ORACLE CLUSTER FILESYSTEM 2 (OCFS2) M: Mark Fasheh <mfasheh@suse.com> M: Joel Becker <jlbec@evilplan.org> @@ -9361,6 +9376,14 @@ F: drivers/hwtracing/stm/ F: include/linux/stm.h F: include/uapi/linux/stm.h +TEE SUBSYSTEM +M: Jens Wiklander <jens.wiklander@linaro.org> +S: Maintained +F: include/linux/tee_drv.h +F: include/uapi/linux/tee.h +F: drivers/tee/ +F: Documentation/tee.txt + THUNDERBOLT DRIVER M: Andreas Noever <andreas.noever@gmail.com> S: Maintained |