diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 16:16:28 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 16:16:28 +0200 |
| commit | 414d06ace9cca3725b6c2072e1951e1e03807f63 (patch) | |
| tree | 31e3c2c3da9260d5541e3d8de7045aabcbf66033 /MAINTAINERS | |
| parent | 97da3854c526d3a6ee05c849c96e48d21527606c (diff) | |
| parent | 14e21cb8f811100a2104e952b8f5bc0326a5e213 (diff) | |
| download | linux-414d06ace9cca3725b6c2072e1951e1e03807f63.tar.gz linux-414d06ace9cca3725b6c2072e1951e1e03807f63.tar.bz2 linux-414d06ace9cca3725b6c2072e1951e1e03807f63.zip | |
Merge tag 'tee-drv-for-4.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee into next/tee
Pull "generic TEE subsystem for v4.12"
Introduce generic TEE subsystem:
- the TEE subsystem itself
- an OP-TEE driver using the subsystem
- optee bindings
- optee node for hi6220-hikey.dts
* tag 'tee-drv-for-4.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee:
arm64: dt: hikey: Add optee node
Documentation: tee subsystem and op-tee driver
tee: add OP-TEE driver
tee: generic TEE subsystem
dt/bindings: add bindings for optee
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c776906f67a9..b814a9d6bd4a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9368,6 +9368,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@versity.com> M: Joel Becker <jlbec@evilplan.org> @@ -11085,6 +11090,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 |