]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 04:29:42 +0000 (14:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 04:29:42 +0000 (14:29 +1000)
commit48e0bc949012c30effe12961a51828dee106f7af
tree45bee9849f3f9b71a44b9c17c197d6b2468fb66b
parentda75c30c1be6c763e0c3a114b2255c7f21937a52
parent4449bf927b61bdb4389393c6fea6837214d1ace7
Merge remote-tracking branch 'ftrace/for-next'
MAINTAINERS
arch/x86/kernel/Makefile
arch/x86/kernel/entry_64.S
include/linux/ftrace.h
include/linux/kprobes.h
kernel/trace/ftrace.c