]> 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)
commit43f58ba3ace78680b0d45af919b505ad53a91715
tree740f90fae4d41d496de6acbb9c4393bdad5ee882
parent77a909b885a6636441eeeeb36c5a011b8e2cdf3a
parent29c042afc35b8ae7e155c00c65bc6d493eb26365
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