From mboxrd@z Thu Jan  1 00:00:00 1970
From: Haojian Zhuang <haojian.zhuang@gmail.com>
Subject: Re: [PATCH 1/4] pinctrl: single: Prepare for supporting SoC specific features
Date: Sun, 9 Jun 2013 13:21:25 +0800
Message-ID: <CAN1soZw5Wwg6_GUNY4Os3ysdi+eciWS1XAtLPynEtRgp2bvkLg@mail.gmail.com>
References: <20130607203936.16513.57494.stgit@localhost>
	<20130607205037.16513.84242.stgit@localhost>
	<CAN1soZzLYpiakcgPR7mBOC7_mLFW=mZwOG98Dq6JpO+JHUW=cw@mail.gmail.com>
	<20130608152732.GR3331@atomide.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Return-path: <linux-omap-owner@vger.kernel.org>
In-Reply-To: <20130608152732.GR3331@atomide.com>
Sender: linux-omap-owner@vger.kernel.org
To: Tony Lindgren <tony@atomide.com>
Cc: Walleij Linus <linus.walleij@linaro.org>, devicetree-discuss@lists.ozlabs.org, Peter Ujfalusi <peter.ujfalusi@ti.com>, linux-omap@vger.kernel.org, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, Roger Quadros <rogerq@ti.com>
List-Id: devicetree@vger.kernel.org

On Sat, Jun 8, 2013 at 11:27 PM, Tony Lindgren <tony@atomide.com> wrote:
> * Haojian Zhuang <haojian.zhuang@gmail.com> [130608 02:43]:
>>
>> Manjunathappa's pinctrl-single patch on enhancing bits is already merged.
>> This patch conflicts with his patch.
>>
>> Could you rebase your patches?
>
> Sure. Looks like Linus W forgot to push out the branch as I don't see
> it yet in the pinctrl tree. Here's a version of this one against current
> Linux next + Manjunathappa's patches.
>
> Regards,
>
> Tony
>

Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>