summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-22 18:10:02 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-22 18:10:02 +0100
commita524446fe82f7f38738403a5a080c4910af86a61 (patch)
treed15127a183d1c2f864136389e5a758ed80a29449 /samples
parent0cf53ff62b3e9e491ff5e5f05b193fb6ce643047 (diff)
parent09c9e84d474d917d9de5b9011ed2064b03a19677 (diff)
parent505f2b970b2269ce4cb669b3ff4f6479d379cec2 (diff)
downloadlinux-a524446fe82f7f38738403a5a080c4910af86a61.tar.bz2
Merge branches 'tracing/ftrace', 'tracing/hw-breakpoints', 'tracing/ring-buffer', 'tracing/textedit' and 'linus' into tracing/core