]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e2ae36 c8b6ad8)
Merge remote-tracking branch 'metag/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Feb 2016 23:41:07 +0000 (10:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Feb 2016 23:41:07 +0000 (10:41 +1100)
1  2 
arch/metag/kernel/ftrace.c patch | diff1 | diff2 | blob | history

diff --cc arch/metag/kernel/ftrace.c
Simple merge
Linux kernel for KaRo TX COM modules