From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756110Ab3FQHJW (ORCPT <rfc822;w@1wt.eu>);
	Mon, 17 Jun 2013 03:09:22 -0400
Received: from www.linutronix.de ([62.245.132.108]:33500 "EHLO
	Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752833Ab3FQHJV (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 17 Jun 2013 03:09:21 -0400
Message-ID: <51BEB61C.3040904@linutronix.de>
Date: Mon, 17 Jun 2013 09:09:16 +0200
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130518 Icedove/17.0.5
MIME-Version: 1.0
To: Stephen Rothwell <sfr@canb.auug.org.au>
CC: Linus Walleij <linus.walleij@linaro.org>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Mugunthan V N <mugunthanvnm@ti.com>,
        David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the pinctrl tree with Linus' tree
References: <20130617161127.f202c6abe603c9ff8b30fc7c@canb.auug.org.au>
In-Reply-To: <20130617161127.f202c6abe603c9ff8b30fc7c@canb.auug.org.au>
X-Enigmail-Version: 1.5.1
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Linutronix-Spam-Score: -1.0
X-Linutronix-Spam-Level: -
X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required,  ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 06/17/2013 08:11 AM, Stephen Rothwell wrote:
> Hi Linus,

Hi Stephen,

> I fixed it up (see below) and can carry the fix as necessary (no
> action is required).

The fix looks good.

Sebastian