Jens Axboe e4b636366c Merge branch 'master' into for-2.6.31 ...

Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

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

2009-05-22 20:25:34 +02:00

..

blktrace.c

block: drop request->hard_* and *nr_sectors

2009-05-11 09:50:54 +02:00

events.c

…

ftrace.c

…

Kconfig

tracing: fix document references

2009-04-10 13:08:50 +02:00

kmemtrace.c

…

Makefile

…

ring_buffer.c

…

trace_boot.c

…

trace_branch.c

tracing: Fix branch tracer header

2009-04-14 02:30:36 +02:00

trace_clock.c

…

trace_event_profile.c

…

trace_event_types.h

…

trace_events_filter.c

tracing/filters: return proper error code when writing filter file

2009-04-12 11:59:29 +02:00

trace_events_stage_1.h

…

trace_events_stage_2.h

ftrace: Output REC->var instead of __entry->var for trace format

2009-04-10 15:48:53 +02:00

trace_events_stage_3.h

…

trace_events.c

tracing/filters: return proper error code when writing filter file

2009-04-12 11:59:29 +02:00

trace_export.c

ftrace: Correct a text align for event format output

2009-04-07 14:02:42 +02:00

trace_functions_graph.c

…

trace_functions.c

…

trace_hw_branches.c

…

trace_irqsoff.c

…

trace_mmiotrace.c

…

trace_nop.c

…

trace_output.c

tracing: fix incorrect return type of ns2usecs()

2009-04-07 13:59:23 +02:00

trace_output.h

…

trace_power.c

tracing: Fix power tracer header

2009-04-13 23:39:57 +02:00

trace_printk.c

…

trace_sched_switch.c

ftrace: Add check of sched_stopped for probe_sched_wakeup

2009-04-07 14:01:11 +02:00

trace_sched_wakeup.c

tracing: remove CALLER_ADDR2 from wakeup tracer

2009-04-07 13:58:54 +02:00

trace_selftest_dynamic.c

…

trace_selftest.c

…

trace_stack.c

…

trace_stat.c

…

trace_stat.h

…

trace_syscalls.c

tracing/syscalls: use a dedicated file header

2009-04-09 05:43:32 +02:00

trace_sysprof.c

…

trace_workqueue.c

…

trace.c

tracing: Append prompt in /debug/tracing/README file

2009-05-15 19:43:22 +02:00

trace.h

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

2009-04-07 14:10:10 -07:00