Jens Axboe ee9a3607fb Merge branch 'master' into for-2.6.35 ...

Conflicts:
	fs/ext3/fsync.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

2010-05-21 21:27:26 +02:00

..

blktrace.c

…

ftrace.c

Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-05-18 08:35:04 -07:00

Kconfig

…

kmemtrace.c

…

Makefile

…

power-traces.c

…

ring_buffer_benchmark.c

…

ring_buffer.c

…

trace_boot.c

…

trace_branch.c

…

trace_clock.c

…

trace_entries.h

…

trace_event_perf.c

…

trace_events_filter.c

…

trace_events.c

…

trace_export.c

…

trace_functions_graph.c

…

trace_functions.c

…

trace_irqsoff.c

…

trace_kprobe.c

…

trace_ksym.c

…

trace_mmiotrace.c

…

trace_nop.c

…

trace_output.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2010-05-21 07:19:18 -07:00

trace_output.h

…

trace_printk.c

…

trace_sched_switch.c

sched: Remove rq argument to the tracepoints

2010-05-07 11:28:17 +02:00

trace_sched_wakeup.c

sched: Remove rq argument to the tracepoints

2010-05-07 11:28:17 +02:00

trace_selftest_dynamic.c

…

trace_selftest.c

Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-05-18 08:35:04 -07:00

trace_stack.c

…

trace_stat.c

…

trace_stat.h

…

trace_syscalls.c

…

trace_sysprof.c

…

trace_workqueue.c

…

trace.c

Merge branch 'master' into for-2.6.35

2010-05-21 21:27:26 +02:00

trace.h

Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-05-18 08:35:04 -07:00