summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/vgpu
diff options
context:
space:
mode:
authorSridhar Lavu <slavu@nvidia.com>2016-05-26 00:34:53 -0400
committerSridhar Lavu <slavu@nvidia.com>2016-05-26 00:39:59 -0400
commit0bd76f6c80d8556514c66d21778f2db10b6ce1d6 (patch)
treebbd36efa03e2bb927968da289d3a459f8b04483e /drivers/gpu/nvgpu/vgpu
parent6bbc169d33ae601b5947c1e54806b9f9bfa6054e (diff)
parent2fe6d9e69e13ce810af563a1e1f0b0ae30861da4 (diff)
Merge branch 'master' into dev-kernel
* master: gpu: nvgpu: 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 'drivers/gpu/nvgpu/vgpu')
0 files changed, 0 insertions, 0 deletions