]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 04:00:34 +0000 (15:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 04:00:34 +0000 (15:00 +1100)
1  2 
kernel/events/uprobes.c
kernel/trace/ftrace.c

Simple merge
Simple merge