From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 10 May 2017 19:03:31 +0000 (+0200)
Subject: Merge branch 'tee/initial-merge' into fixes
X-Git-Tag: v4.12-rc2~20^2~13
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=e038d5515b4a0c0946f331f4eeaa538453a89c36

Merge branch 'tee/initial-merge' into fixes

This is a dependency for the following fix

* tee/initial-merge:
  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
---

e038d5515b4a0c0946f331f4eeaa538453a89c36