Jens Axboe b4b7a4ef09 Merge branch 'master' into for-linus ...

Conflicts:
	block/Kconfig

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

2010-03-19 08:05:10 +01:00

..

events

Add DocBook documentation for the block tracepoints.

2010-03-09 09:26:04 +01:00

boot.h

tracing/fastboot: include missing headers

2008-12-12 09:26:13 +01:00

define_trace.h

events: Rename TRACE_EVENT_TEMPLATE() to DECLARE_EVENT_CLASS()

2009-11-26 09:04:55 +01:00

ftrace.h

rcu, ftrace: Fix RCU lockdep splat in ftrace_perf_buf_prepare()

2010-03-04 12:07:35 +01:00

syscall.h

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

2010-02-28 10:20:25 -08:00