Merge 'Linux 3.10.96' into rel-24
Mrutyunjay Sawant [Mon, 7 Mar 2016 12:43:35 +0000 (04:43 -0800)]
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>

1  2 
arch/arm64/Kconfig
mm/memory.c

Simple merge
diff --cc mm/memory.c
Simple merge