Hi Rob, On Mon, 12 Mar 2012 13:13:23 -0400 Steven Rostedt <srostedt@xxxxxxxxxx> wrote: > > On Mon, 2012-03-12 at 12:06 -0500, Rob Lee wrote: > > > > > Looks good to me as well. > > > > Who should carry this fixup? > > I think it's trivial enough that Linus can handle it. He always said > that he likes to fix merge conflicts and has yelled at people who did > things to prevent them. Yeah, I just carry it in my tree and Linus will fix it up when he merges the trees in his. [The assumption is that anything I can figure out so can Linus :-)] -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpM1oAeHsO1O.pgp
Description: PGP signature
