Merge branch 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 2 Dec 2008 08:20:29 +0000 (09:20 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 2 Dec 2008 08:20:29 +0000 (09:20 +0100)
Conflicts:
kernel/trace/ring_buffer.c


Trivial merge