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

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

Tue, 10 Jan 2017 04:01:14 +0000 (12:01 +0800)

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

Tue, 10 Jan 2017 04:01:14 +0000 (12:01 +0800)
author Alex Shi <alex.shi@linaro.org>
Tue, 10 Jan 2017 04:01:14 +0000 (12:01 +0800)
committer Alex Shi <alex.shi@linaro.org>
Tue, 10 Jan 2017 04:01:14 +0000 (12:01 +0800)
diff --cc kernel/time/timekeeping.c
Simple merge
diff --cc kernel/trace/trace_functions_graph.c
Simple merge
author	Alex Shi <alex.shi@linaro.org>
	Tue, 10 Jan 2017 04:01:14 +0000 (12:01 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Tue, 10 Jan 2017 04:01:14 +0000 (12:01 +0800)
		1	2
kernel/time/timekeeping.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_functions_graph.c	patch \|	diff1 \|	diff2 \|	blob \| history