Subject: Re: linux-next: manual merge of the cpuidle-cons tree with the tip tree

From: Steven Rostedt <[email-masked]>
Date: Mon, 12 Mar 2012 13:13:23 -0400

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.

-- Steve