From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steven Rostedt <srostedt@redhat.com>
Subject: Re: linux-next: manual merge of the cpuidle-cons tree with the tip
 tree
Date: Mon, 12 Mar 2012 13:13:23 -0400
Message-ID: <1331572403.1149.19.camel@fedora>
References: <20120309184041.bd10edffa51dcd43ce069487@canb.auug.org.au>
	 <1331300109.1149.17.camel@fedora>
	 <CAMXH7KHdfzjZCsBMkFOnwYtyaqBztMY99QcZ7VwLP0JASUiVAw@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <CAMXH7KHdfzjZCsBMkFOnwYtyaqBztMY99QcZ7VwLP0JASUiVAw@mail.gmail.com>
Sender: linux-kernel-owner@vger.kernel.org
To: Rob Lee <rob.lee@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>
List-Id: linux-next.vger.kernel.org

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