projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f63c6ea be90e26)
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Mon, 15 May 2017 09:31:58 +0000 (17:31 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 15 May 2017 09:31:58 +0000 (17:31 +0800)
1  2 
arch/arm/kernel/Makefile patch | diff1 | diff2 | blob | history
arch/x86/kernel/ftrace.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/kernel/Makefile
Simple merge
diff --cc arch/x86/kernel/ftrace.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.