Merge commit 'tip/tracing/core' into oprofile/core

Browse source

Conflicts:
	drivers/oprofile/cpu_buffer.c

Signed-off-by: Robert Richter <robert.richter@amd.com>

...

This commit is contained in:

Robert Richter 2010-04-23 16:47:51 +02:00

parent cb6e943ccf c1ab9cab75

commit b971f06187

13 changed files with 186 additions and 80 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

include/linux/ftrace_event.h

View file

6

include/linux/module.h

View file

6

include/linux/ring_buffer.h

View file

18

include/trace/events/module.h

View file

52

include/trace/events/signal.h

View file

33

include/trace/ftrace.h

View file