On Fri, 2013-05-03 at 20:25 -0400, Steven Rostedt wrote: > Reported-by: zhangwei(Jovi) <[email protected]> > Cc: [email protected] > Cc: Thomas Gleixner <[email protected]> > Cc: Peter Zijlstra <[email protected]> > Cc: Frederic Weisbecker <[email protected]> > Signed-off-by: Steven Rostedt <[email protected]> > > Conflicts: > > kernel/trace/trace.c > > Conflicts: > > kernel/trace/trace.c > ---
Grumble, I forgot to remove these. As I was using the previous commit for the next kernel, I got two of them :-p I'll crop it for 3.0. -- Steve -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
