]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 04:50:33 +0000 (14:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 04:50:33 +0000 (14:50 +1000)
1  2 
Documentation/kernel-parameters.txt
kernel/sysctl.c
kernel/trace/trace.c

Simple merge
diff --cc kernel/sysctl.c
Simple merge
Simple merge