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 /Documentation/devicetree/bindings/vendor-prefixes.txt | |
parent | 97da3854c526d3a6ee05c849c96e48d21527606c (diff) | |
parent | 14e21cb8f811100a2104e952b8f5bc0326a5e213 (diff) |
Merge tag 'tee-drv-for-4.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee into next/teearmsoc-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 'Documentation/devicetree/bindings/vendor-prefixes.txt')
-rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index ec0bfb9bbebd..e18a96cf7c3a 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -168,6 +168,7 @@ lego LEGO Systems A/S lenovo Lenovo Group Ltd. lg LG Corporation licheepi Lichee Pi +linaro Linaro Limited linux Linux-specific binding lltc Linear Technology Corporation lsi LSI Corp. (LSI Logic) |