Merge branch 'tee/initial-merge' into fixes
authorArnd Bergmann <arnd@arndb.de>
Wed, 10 May 2017 19:03:31 +0000 (21:03 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 10 May 2017 19:03:31 +0000 (21:03 +0200)
commite038d5515b4a0c0946f331f4eeaa538453a89c36
tree740f90fae4d41d496de6acbb9c4393bdad5ee882
parent6cde26fda11b3e7bcc17574c6a71e96ac40f2573
parent14e21cb8f811100a2104e952b8f5bc0326a5e213
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
Documentation/devicetree/bindings/vendor-prefixes.txt
Documentation/ioctl/ioctl-number.txt
MAINTAINERS
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
drivers/Makefile