Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

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

Fri, 28 Apr 2017 04:03:34 +0000 (12:03 +0800)

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

Fri, 28 Apr 2017 04:03:34 +0000 (12:03 +0800)
author Alex Shi <alex.shi@linaro.org>
Fri, 28 Apr 2017 04:03:34 +0000 (12:03 +0800)
committer Alex Shi <alex.shi@linaro.org>
Fri, 28 Apr 2017 04:03:34 +0000 (12:03 +0800)
diff --cc Makefile
Simple merge
diff --cc block/genhd.c
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
author	Alex Shi <alex.shi@linaro.org>
	Fri, 28 Apr 2017 04:03:34 +0000 (12:03 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Fri, 28 Apr 2017 04:03:34 +0000 (12:03 +0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
block/genhd.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	patch \|	diff1 \|	diff2 \|	blob \| history