Olof Johansson 5252d73756 Merge tag 'v4.12-rc1' into fixes ...

We've received a few fixes branches with -rc1 as base, but our contents was
still at pre-rc1. Merge it in expliticly to make 'git merge --log' clear on
hat was actually merged.

Signed-off-by: Olof Johansson <[email protected]>

2017-05-18 23:54:47 -07:00

..

optee

…

Kconfig

…

Makefile

…

tee_core.c

…

tee_private.h

…

tee_shm_pool.c

…

tee_shm.c

…