]> rtime.felk.cvut.cz Git - hercules2020/nv-tegra/linux-4.4.git/commitdiff
projects / hercules2020 / nv-tegra / linux-4.4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fa98cf 067d1d4)
Merge branch 'master' into dev-kernel
authorSridhar Lavu <slavu@nvidia.com>
Thu, 26 May 2016 04:30:55 +0000 (21:30 -0700)
committerSridhar Lavu <slavu@nvidia.com>
Thu, 26 May 2016 04:31:52 +0000 (21:31 -0700)
* master:
  kernel: change kernel path

Conflicts:
drivers/media/platform/tegra/vi/Makefile

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


Trivial merge