Jiri Kosina 6396fc3b3f Merge branch 'master' into for-next ...

Conflicts:
	fs/exofs/inode.c

2010-08-11 09:36:51 +02:00

..

blktrace.c

block: push BKL into blktrace ioctls

2010-08-07 18:26:08 +02:00

ftrace.c

…

Kconfig

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2010-08-07 12:42:58 -07:00

Makefile

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

2010-08-06 09:30:52 -07:00

power-traces.c

…

ring_buffer_benchmark.c

…

ring_buffer.c

…

trace_branch.c

…

trace_clock.c

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

2010-08-06 09:39:22 -07:00

trace_entries.h

…

trace_event_perf.c

perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call

2010-08-02 01:30:56 +02:00

trace_events_filter.c

…

trace_events.c

…

trace_export.c

…

trace_functions_graph.c

…

trace_functions.c

…

trace_irqsoff.c

…

trace_kdb.c

ftrace,kdb: Allow dumping a specific cpu's buffer with ftdump

2010-08-05 09:22:23 -05:00

trace_kprobe.c

Merge branch 'master' into for-next

2010-08-10 13:22:08 +02:00

trace_mmiotrace.c

…

trace_nop.c

…

trace_output.c

…

trace_output.h

…

trace_printk.c

…

trace_sched_switch.c

…

trace_sched_wakeup.c

…

trace_selftest_dynamic.c

…

trace_selftest.c

…

trace_stack.c

…

trace_stat.c

…

trace_stat.h

…

trace_syscalls.c

…

trace_workqueue.c

…

trace.c

Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing

2010-08-07 17:06:54 -07:00

trace.h

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

2010-08-06 09:30:52 -07:00