]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 01:43:54 +0000 (12:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 01:43:54 +0000 (12:43 +1100)
1  2 
kernel/trace/blktrace.c
kernel/trace/ftrace.c
kernel/trace/trace_sched_wakeup.c

Simple merge
Simple merge
Simple merge