]> rtime.felk.cvut.cz Git - hercules2020/nv-tegra/linux-4.4.git/commit
projects / hercules2020 / nv-tegra / linux-4.4.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ba85ee9) | patch
Merge remote-tracking branch 'origin/dev/dev-tlk-k44-bringup' into HEAD
authorMihir Joshi <mihirj@nvidia.com>
Tue, 18 Jul 2017 20:51:10 +0000 (13:51 -0700)
committermobile promotions <svcmobile_promotions@nvidia.com>
Fri, 28 Jul 2017 10:01:39 +0000 (03:01 -0700)
commit7ea942b640cda408c51ff6a0867617fe9a8c6d16
tree7611672642aa089838c420eaadcde9f18987cbeatree | snapshot
parentba85ee93ba8715750eda8357b0a4c698c0d15905commit | diff
Merge remote-tracking branch 'origin/dev/dev-tlk-k44-bringup' into HEAD

This merge commit tracks TLK driver commits from kernel-shield-3.10
Start commit: b30a02b2b7468e0f1f031740f0ec9fc097a019b0
End commit: 9a71f2fb564ef4cdfbcdb24c6bc7115a5dbe4489

Bug 1961076

Change-Id: I4e70f2b16e4571b0cfa30b5a3a5b6b0b55a453f1
(cherry picked from commit 360fd6f21aacbdd803c12481bc0b2649c36b78e1)
Reviewed-on: https://git-master.nvidia.com/r/1528197
GVS: Gerrit_Virtual_Submit
Reviewed-by: Mihir Joshi <mihirj@nvidia.com>
Tested-by: Mihir Joshi <mihirj@nvidia.com>
Reviewed-by: Hayden Du <haydend@nvidia.com>
14 files changed:
include/linux/ote_protocol.h diff | blob | history
security/Kconfig diff | blob | history
security/Makefile diff | blob | history
security/tlk_driver/Kconfig [new file with mode: 0644] blob
security/tlk_driver/Makefile [new file with mode: 0644] blob
security/tlk_driver/ote_asm.S [new file with mode: 0644] blob
security/tlk_driver/ote_comms.c [new file with mode: 0644] blob
security/tlk_driver/ote_device.c [new file with mode: 0644] blob
security/tlk_driver/ote_fiq_glue.c [new file with mode: 0644] blob
security/tlk_driver/ote_fs.c [new file with mode: 0644] blob
security/tlk_driver/ote_log.c [new file with mode: 0644] blob
security/tlk_driver/ote_memory.c [new file with mode: 0644] blob
security/tlk_driver/ote_protocol.h [new file with mode: 0644] blob
security/tlk_driver/ote_types.h [new file with mode: 0644] blob