Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 10 Jan 2017 04:01:14 +0000 (12:01 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 10 Jan 2017 04:01:14 +0000 (12:01 +0800)
commit7785301d9209cf083369c6f088cd1d48ec417863
tree693ad3a1ebdc818a37abebbd8257820604ea8a35
parent19192a140ad72b5bd0d57620bfe236bc03561bb6
parentf02e043c5ee3014ba0fbae38e699008385c99d7b
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
kernel/time/timekeeping.c
kernel/trace/trace_functions_graph.c