]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
commit964874b8aa3293579c92b5eaa965f518f9a5d6c2
treef3fe9fdc74c83c9b85156be4e308a7cd856c11b4
parent984024e70c928225ccb1717bd7da47f85fc17658
parenta4c35ed241129dd142be4cadb1e5a474a56d5464
Merge remote-tracking branch 'ftrace/for-next'
kernel/events/uprobes.c
kernel/trace/ftrace.c