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)
commit74bf3cabc306f31ddd02f2c1b0540a6cfcacc593
treec9f2997a7266cc5d8c5b61e964d8e014f274f5d3
parentc7cc77307669336a08928ab8668bdb3f3bcc021b
parent4f5a7f40ddbae98569acbb99118a98570315579c
Merge branch 'tracing/urgent' into tracing/core

Conflicts:
kernel/trace/ring_buffer.c