]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 03:30:23 +0000 (13:30 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 03:30:23 +0000 (13:30 +1000)
1  2 
include/linux/ftrace.h
kernel/trace/ftrace.c

Simple merge
Simple merge