]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit24941d5d996acd4648f87cdb067177a8e49fa923
tree7b11c4e9c89adf27abca3b2334091b110b15e044
parent4df6d137f9068c2cb72220f731eb68763a35aef0
parentb7e0bf341f6cfa92ae0a0e3d0c3496729595e1e9
Merge remote-tracking branch 'ftrace/for-next'
kernel/events/uprobes.c
kernel/trace/ftrace.c