tree 2567b00257b633fa13220fa515d4bad9749405db
parent d844222a54c33a960755b44b934cd1b01b05dceb
parent 3e89c7bb92fc92bb964734341487798c8d497bae
parent c1e7abbc7afc97367cd77c8f2895c2169a8f9c87
author Ingo Molnar <mingo@elte.hu> 1226481097 +0100
committer Ingo Molnar <mingo@elte.hu> 1226481097 +0100

Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

Conflicts:
	kernel/trace/ring_buffer.c