Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

author Mark Brown <broonie@linaro.org>

Sat, 26 Oct 2013 11:52:53 +0000 (12:52 +0100)

committer Mark Brown <broonie@linaro.org>

Sat, 26 Oct 2013 11:52:53 +0000 (12:52 +0100)
author Mark Brown <broonie@linaro.org>
Sat, 26 Oct 2013 11:52:53 +0000 (12:52 +0100)
committer Mark Brown <broonie@linaro.org>
Sat, 26 Oct 2013 11:52:53 +0000 (12:52 +0100)
diff --cc arch/arm/kernel/process.c
Simple merge
diff --cc mm/shmem.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Sat, 26 Oct 2013 11:52:53 +0000 (12:52 +0100)
committer	Mark Brown <broonie@linaro.org>
	Sat, 26 Oct 2013 11:52:53 +0000 (12:52 +0100)
		1	2
arch/arm/kernel/process.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	patch \|	diff1 \|	diff2 \|	blob \| history