]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f64020 32356d3)
Merge tag 'tee-misc-for-v5.1' of https://git.linaro.org/people/jens.wiklander/linux...
authorArnd Bergmann <arnd@arndb.de>
Fri, 1 Mar 2019 14:00:40 +0000 (15:00 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 1 Mar 2019 14:01:16 +0000 (15:01 +0100)
OP-TEE driver
- dual license for optee_msg.h and optee_smc.h
Generic
- add cancellation support to client interface

* tag 'tee-misc-for-v5.1' of https://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: optee: update optee_msg.h and optee_smc.h to dual license
  tee: add cancellation support to client interface

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
drivers/tee/tee_core.c patch | diff1 | diff2 | blob | history

diff --cc drivers/tee/tee_core.c
Simple merge
local clone of linux.git