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: event profile hooks

2009-03-20 10:17:07 +01:00

ftrace.c

function-graph: allow unregistering twice

2009-04-01 14:47:42 +02:00

Kconfig

tracing: fix document references

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

kmemtrace.c

kmemtrace: small cleanups

2009-04-03 12:23:09 +02:00

Makefile

tracing: add per-event filtering

2009-03-22 18:38:46 +01:00

ring_buffer.c

ring-buffer: do not remove reader page from list on ring buffer free

2009-04-01 14:47:53 +02:00

trace_boot.c

…

trace_branch.c

tracing: Fix branch tracer header

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

trace_clock.c

tracing: fix four sparse warnings

2009-03-22 18:16:54 +01:00

trace_event_profile.c

ftrace: event profile hooks

2009-03-20 10:17:07 +01:00

trace_event_types.h

tracing: remove recording function depth from trace_printk

2009-03-19 15:58:47 -04:00

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

tracing: update comments to match event code macros

2009-03-10 13:12:58 -04:00

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

tracing/events: don't discard an event after commit

2009-03-23 09:22:15 +01:00

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

function-graph: moved the timestamp from arch to generic code

2009-03-24 09:31:34 -04:00

trace_functions.c

…

trace_hw_branches.c

…

trace_irqsoff.c

tracing: have latency tracers set the latency format

2009-03-04 22:15:30 -05:00

trace_mmiotrace.c

tracing: remove recording function depth from trace_printk

2009-03-19 15:58:47 -04:00

trace_nop.c

tracing/ftrace: make nop-tracer use polling wait for events on pipe

2009-03-23 09:22:15 +01:00

trace_output.c

tracing: fix incorrect return type of ns2usecs()

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

trace_output.h

trace: make argument 'mem' of trace_seq_putmem() const

2009-03-31 17:45:13 +02:00

trace_power.c

tracing: Fix power tracer header

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

trace_printk.c

tracing: remove recording function depth from trace_printk

2009-03-19 15:58:47 -04:00

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

tracing: keep the tracing buffer after self-test failure

2009-03-22 15:17:21 +01:00

trace_stack.c

tracing: left align location header in stack_trace

2009-03-13 00:00:58 -04:00

trace_stat.c

trace_stat: keep original order

2009-03-25 18:32:34 +01:00

trace_stat.h

…

trace_syscalls.c

tracing/syscalls: use a dedicated file header

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

trace_sysprof.c

tracing: make all file_operations const

2009-03-05 21:46:40 -05:00

trace_workqueue.c

trace_workqueues: fix empty line's output

2009-03-25 18:32:35 +01:00

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