diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-05-10 21:03:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-05-10 21:03:31 +0200 |
| commit | e038d5515b4a0c0946f331f4eeaa538453a89c36 (patch) | |
| tree | 740f90fae4d41d496de6acbb9c4393bdad5ee882 /drivers/nvdimm/blk.c | |
| parent | Merge tag 'mvebu-arm64-4.12-1' of git://git.infradead.org/linux-mvebu into fixes (diff) | |
| parent | arm64: dt: hikey: Add optee node (diff) | |
| download | linux-e038d5515b4a0c0946f331f4eeaa538453a89c36.tar.xz linux-e038d5515b4a0c0946f331f4eeaa538453a89c36.zip | |
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
Diffstat (limited to 'drivers/nvdimm/blk.c')
0 files changed, 0 insertions, 0 deletions