diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-07-06 11:12:46 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-07-06 11:12:46 +0800 |
| commit | 03a929fbcbb1f7dca3cca19eefcbc15ecc191331 (patch) | |
| tree | 25eb3fb76fb618c29ae31c0638b45285782c666b /MAINTAINERS | |
| parent | 267aa95e09eec438abf8979b58cded5cbc5586cb (diff) | |
| parent | 6cffde33c2b0e522cfc96eda06390b532408ca32 (diff) | |
Merge remote-tracking branch 'origin/v4.4/topic/optee-lsk-mainline' into linux-linaro-lsk-v4.4
Conflicts:
compatiable issues in
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/asm-offsets.c
arch/arm64/kvm/hyp/fpsimd.S
drivers/firmware/psci.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7875f7b71546..80f52fa040e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7939,6 +7939,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> @@ -9366,6 +9371,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 |