tree c9f2997a7266cc5d8c5b61e964d8e014f274f5d3
parent c7cc77307669336a08928ab8668bdb3f3bcc021b
parent 4f5a7f40ddbae98569acbb99118a98570315579c
author Ingo Molnar <mingo@elte.hu> 1228206029 +0100
committer Ingo Molnar <mingo@elte.hu> 1228206029 +0100

Merge branch 'tracing/urgent' into tracing/core

Conflicts:
	kernel/trace/ring_buffer.c