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

author Mark Brown <broonie@linaro.org>

Fri, 4 Apr 2014 10:53:18 +0000 (11:53 +0100)

committer Mark Brown <broonie@linaro.org>

Fri, 4 Apr 2014 10:53:18 +0000 (11:53 +0100)
author Mark Brown <broonie@linaro.org>
Fri, 4 Apr 2014 10:53:18 +0000 (11:53 +0100)
committer Mark Brown <broonie@linaro.org>
Fri, 4 Apr 2014 10:53:18 +0000 (11:53 +0100)
diff --cc include/linux/mm.h
Simple merge
diff --cc mm/page_alloc.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Fri, 4 Apr 2014 10:53:18 +0000 (11:53 +0100)
committer	Mark Brown <broonie@linaro.org>
	Fri, 4 Apr 2014 10:53:18 +0000 (11:53 +0100)
		1	2
include/linux/mm.h	patch \|	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	patch \|	diff1 \|	diff2 \|	blob \| history