From mboxrd@z Thu Jan  1 00:00:00 1970
From: Eric Miao <eric.y.miao@gmail.com>
Subject: Re: linux-next: manual merge of the pxa tree with Linus' tree
Date: Mon, 03 Aug 2009 21:53:23 +0800
Message-ID: <4A76EBD3.6010006@gmail.com>
References: <20090803110314.1c2c3cca.sfr@canb.auug.org.au>
Reply-To: eric.y.miao@gmail.com
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-ew0-f214.google.com ([209.85.219.214]:59201 "EHLO
	mail-ew0-f214.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932097AbZHCNxn (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 3 Aug 2009 09:53:43 -0400
In-Reply-To: <20090803110314.1c2c3cca.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Eric Miao <eric.y.miao@gmail.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Marek Vasut <marek.vasut@gmail.com>, Joe Perches <joe@perches.com>, Andrew Morton <akpm@linux-foundation.org>

Stephen Rothwell wrote:
> Hi Eric,
> 
> Today's linux-next merge of the pxa tree got a conflict in MAINTAINERS
> between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS:
> coalesce name and email address lines") from Linus' tree and commit
> 4ad9febe53347962225169c5bde2ec030e46ab1d ("Palm Tungsten|C initial
> support") from the pxa tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Stephen,

Thanks for the fix.