]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commit
projects / sojka / nv-tegra / linux-3.10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c81ea5f 057b2f9)
Merge 'Linux 3.10.96' into rel-24
authorSumit Singh <sumsingh@nvidia.com>
Tue, 1 Mar 2016 09:48:23 +0000 (15:18 +0530)
committerSumit Singh <sumsingh@nvidia.com>
Tue, 1 Mar 2016 09:48:23 +0000 (15:18 +0530)
commit0a786c81376359d6fca7729a00a85195cfa291f9
treefe6ace787c70e47fe69c435225edf1c9e3e05ac4tree | snapshot
parentc81ea5fe383c44e872754b363968af57d84225accommit | diff
parent057b2f96fabb71fd2579f8e273e9023d75368c6fcommit | diff
Merge 'Linux 3.10.96' into rel-24

Here we are trying to merge linux-3.10.96 with rel-24. For this
we have to revert a downstream change. So, in order to avoid pushing a
separate change for that, we first pushed merge of the upstream change
with the reverted change to a dev branch, and now are merging the dev-branch
with rel-24 TOT.

Bug 200176691

Change-Id: Ia4f0071f52aa0068c8eb8165739dab39414d97f5
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>