diff options
author | Sridhar Lavu <slavu@nvidia.com> | 2016-05-26 00:35:15 -0400 |
---|---|---|
committer | Sridhar Lavu <slavu@nvidia.com> | 2016-05-26 00:40:42 -0400 |
commit | 5cdf5ac0400e4c1c7e00930a347bed8d07a598fe (patch) | |
tree | 85f0611739c527732bbe87f179cde828efa66225 /include | |
parent | eafba025b279fed658d03fd35b3877ef02797796 (diff) | |
parent | 5d2a592383dcfef536b6d6169992f85c9d8bdaab (diff) |
Merge branch 'master' into dev-kernel
* master:
gpu: nvgpu: gv11b: change kernel path
Merge main back to dev-kernel after the module bypass
in dev-kernel and main that was used to assist with
the kernel directories re-org.
MODULE BYPASS
Bug 200190733
BOOMERANG-10
Change-Id: Ifa91202d3fa792b5f13133a95fd546d92a9ee17b
Signed-off-by: Sridhar Lavu <slavu@nvidia.com>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions