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

author Alex Shi <alex.shi@linaro.org>

Fri, 8 Aug 2014 05:38:04 +0000 (13:38 +0800)

committer Alex Shi <alex.shi@linaro.org>

Fri, 8 Aug 2014 05:38:04 +0000 (13:38 +0800)
author Alex Shi <alex.shi@linaro.org>
Fri, 8 Aug 2014 05:38:04 +0000 (13:38 +0800)
committer Alex Shi <alex.shi@linaro.org>
Fri, 8 Aug 2014 05:38:04 +0000 (13:38 +0800)
diff --cc kernel/sched/core.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge
author	Alex Shi <alex.shi@linaro.org>
	Fri, 8 Aug 2014 05:38:04 +0000 (13:38 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Fri, 8 Aug 2014 05:38:04 +0000 (13:38 +0800)
		1	2
kernel/sched/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	patch \|	diff1 \|	diff2 \|	blob \| history