-
Thomas Gleixner authored
Conflicts: kernel/trace/ring_buffer.c kernel/trace/trace.c Signed-off-by:Thomas Gleixner <tglx@linutronix.de>
499027af
Conflicts:
kernel/trace/ring_buffer.c
kernel/trace/trace.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>