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

author Mark Brown <broonie@kernel.org>

Sun, 12 Oct 2014 09:13:30 +0000 (10:13 +0100)

committer Mark Brown <broonie@kernel.org>

Sun, 12 Oct 2014 09:13:30 +0000 (10:13 +0100)
author Mark Brown <broonie@kernel.org>
Sun, 12 Oct 2014 09:13:30 +0000 (10:13 +0100)
committer Mark Brown <broonie@kernel.org>
Sun, 12 Oct 2014 09:13:30 +0000 (10:13 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/kernel/smp.c
Simple merge
diff --cc arch/arm64/Kconfig
Simple merge
diff --cc arch/arm64/Makefile
Simple merge
diff --cc include/linux/mm.h
Simple merge
author	Mark Brown <broonie@kernel.org>
	Sun, 12 Oct 2014 09:13:30 +0000 (10:13 +0100)
committer	Mark Brown <broonie@kernel.org>
	Sun, 12 Oct 2014 09:13:30 +0000 (10:13 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	patch \|	diff1 \|	diff2 \|	blob \| history