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

author Mark Brown <broonie@linaro.org>

Thu, 14 Aug 2014 13:22:49 +0000 (14:22 +0100)

committer Mark Brown <broonie@linaro.org>

Thu, 14 Aug 2014 13:22:49 +0000 (14:22 +0100)
author Mark Brown <broonie@linaro.org>
Thu, 14 Aug 2014 13:22:49 +0000 (14:22 +0100)
committer Mark Brown <broonie@linaro.org>
Thu, 14 Aug 2014 13:22:49 +0000 (14:22 +0100)
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/sched/core.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Thu, 14 Aug 2014 13:22:49 +0000 (14:22 +0100)
committer	Mark Brown <broonie@linaro.org>
	Thu, 14 Aug 2014 13:22:49 +0000 (14:22 +0100)
		1	2
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	patch \|	diff1 \|	diff2 \|	blob \| history