]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 07:22:00 +0000 (18:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 07:22:00 +0000 (18:22 +1100)
1  2 
kernel/events/uprobes.c
kernel/trace/ftrace.c

Simple merge
Simple merge