Merge branches 'tracing/ftrace', 'tracing/hw-breakpoints', 'tracing/ring-buffer', 'tracing/textedit' and 'linus' into tracing/core

Browse source

...

This commit is contained in:

Ingo Molnar 2009-03-22 18:10:02 +01:00

parent 0cf53ff62b 09c9e84d47 505f2b970b

commit a524446fe8

3 changed files with 16 additions and 14 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

16

kernel/extable.c

View file

8

kernel/trace/ring_buffer.c

View file

8

mm/memory.c

View file