Merge branch 'lsk/kdump/for-v4.4' into linux-linaro-lsk-v4.4

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

Wed, 28 Jun 2017 14:13:59 +0000 (22:13 +0800)

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

Wed, 28 Jun 2017 14:13:59 +0000 (22:13 +0800)
author Alex Shi <alex.shi@linaro.org>
Wed, 28 Jun 2017 14:13:59 +0000 (22:13 +0800)
committer Alex Shi <alex.shi@linaro.org>
Wed, 28 Jun 2017 14:13:59 +0000 (22:13 +0800)
diff --cc include/linux/memblock.h
Simple merge
diff --cc mm/memblock.c
Simple merge
author	Alex Shi <alex.shi@linaro.org>
	Wed, 28 Jun 2017 14:13:59 +0000 (22:13 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Wed, 28 Jun 2017 14:13:59 +0000 (22:13 +0800)
		1	2
include/linux/memblock.h	patch \|	diff1 \|	diff2 \|	blob \| history
mm/memblock.c	patch \|	diff1 \|	diff2 \|	blob \| history