Theodore Ts'o a107e5a3a4 Merge branch 'next' into upstream-merge ...

Conflicts:
	fs/ext4/inode.c
	fs/ext4/mballoc.c
	include/trace/events/ext4.h

2010-10-27 23:44:47 -04:00

..

events

Merge branch 'next' into upstream-merge

2010-10-27 23:44:47 -04:00

define_trace.h

tracing: Fix tracepoint.h DECLARE_TRACE() to allow more than one header

2010-05-05 11:46:17 -04:00

ftrace.h

tracing: Drop cpparg() macro

2010-08-02 01:31:28 +02:00

syscall.h

tracing: Use a global field list for all syscall exit events

2010-06-28 17:12:44 -04:00