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

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc Documentation/ioctl/ioctl-number.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
Simple merge

diff --cc drivers/Makefile
Simple merge