summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-20 10:14:53 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-20 10:14:53 +0100
commit22de89b371a18086162eacd9f8c960299334ab01 (patch)
tree518227dde7ba892413163b32341c5d319da13949 /block
parent3bf832ce1fe6988148d392599f34ca0c6a34427d (diff)
parentf02b8624fedca39886b0eef770dca70c2f0749b3 (diff)
parenta635cf0497342978d417cae19d4a4823932977ff (diff)
parent65c24491b4fef017c64e39ec64384fde5e05e0a0 (diff)
Merge branches 'tracing/ftrace', 'tracing/kprobes', 'tracing/tasks' and 'linus' into tracing/core