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

author Mark Brown <broonie@linaro.org>

Thu, 29 Aug 2013 17:40:30 +0000 (18:40 +0100)

committer Mark Brown <broonie@linaro.org>

Thu, 29 Aug 2013 17:40:30 +0000 (18:40 +0100)
author Mark Brown <broonie@linaro.org>
Thu, 29 Aug 2013 17:40:30 +0000 (18:40 +0100)
committer Mark Brown <broonie@linaro.org>
Thu, 29 Aug 2013 17:40:30 +0000 (18:40 +0100)
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Thu, 29 Aug 2013 17:40:30 +0000 (18:40 +0100)
committer	Mark Brown <broonie@linaro.org>
	Thu, 29 Aug 2013 17:40:30 +0000 (18:40 +0100)
		1	2
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	patch \|	diff1 \|	diff2 \|	blob \| history