Merge branch 'tracing/urgent' into tracing/core
Ingo Molnar [Tue, 2 Dec 2008 08:20:29 +0000 (09:20 +0100)]
Conflicts:
kernel/trace/ring_buffer.c


Trivial merge