From: Arnd Bergmann Date: Fri, 1 Mar 2019 14:00:40 +0000 (+0100) Subject: Merge tag 'tee-misc-for-v5.1' of https://git.linaro.org/people/jens.wiklander/linux... X-Git-Tag: v5.1-rc1~156^2~1 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3473b71e21609c9dfb74d0a5a13d6321d3049c05;p=linux.git 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 --- 3473b71e21609c9dfb74d0a5a13d6321d3049c05