OSDN Git Service

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)
commit3473b71e21609c9dfb74d0a5a13d6321d3049c05
tree8012fa7c602a79c9c90303694b7749dcd2f0e136
parent4f640201a8aebcee053712828f5457aee9909cc8
parent32356d309c22a9497e612ed437d66407e15935f3
Merge tag 'tee-misc-for-v5.1' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers

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>
drivers/tee/tee_core.c