Merge 'Linux 3.10.96' into rel-24
authorMrutyunjay Sawant <msawant@nvidia.com>
Mon, 7 Mar 2016 12:43:35 +0000 (04:43 -0800)
committerMrutyunjay Sawant <msawant@nvidia.com>
Mon, 7 Mar 2016 12:43:35 +0000 (04:43 -0800)
commit4d713f1195a17ffe8f6e5a026b3364c60a41afea
treed292b99151beb263fefd2c2d82d7a83637a911f9
parent1f84dc48634790bbf668b0dd9263a4b72a6e27f1
parent0a786c81376359d6fca7729a00a85195cfa291f9
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>
arch/arm64/Kconfig
mm/memory.c