]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 04:50:26 +0000 (15:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 04:50:26 +0000 (15:50 +1100)
commit9609a6b949f1674047aea009c5e593ff8ceaf64a
tree2f005fcba5f50f92ac3d896db009677913801aba
parent1328469e5fd50134b2e46f901545e7a6d1ea9076
parente0d18fe063464cb3f1a6d1939e4fcf47d92d8386
Merge remote-tracking branch 'ftrace/for-next'
kernel/events/uprobes.c
kernel/trace/ftrace.c