]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita8c255851a9b9e511ad56504331ae6f903771067
tree740f90fae4d41d496de6acbb9c4393bdad5ee882
parentd9cd8a6ba00afefebabc6d4c5357f37035bd88d0
parent29400f6f7ec1f98c9d196f27d0be080ca2eecb19
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