Merge branch 'android-3.10' into 'dev-kernel-3.10'
Sumit Singh [Wed, 10 Dec 2014 05:39:04 +0000 (10:39 +0530)]
Bug 200058653

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

1  2 
kernel/power/process.c
mm/memcontrol.c
sound/soc/tegra-alt/tegra210_adsp_alt.c

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