[PATCH V5 2/2] mfd: stmpe: Update DT support in stmpe driver

[Viresh Kumar]

On Nov 30, 2012 6:50 PM, "Lee Jones" <lee.jones at linaro.org> wrote:
>
> On Fri, 30 Nov 2012, Viresh Kumar wrote:
>
> > On 30 November 2012 18:15, Lee Jones <lee.jones at linaro.org> wrote:
> > > The patch doesn't apply for me - does it for you?
> > >
> > > Viresh, what's it based on?
> >
> > Because this was applied 2 days back by Samuel, and i didn't
> > fetch it again yesterday:
> >
> > commit 20d5c7defc228cdaeff3ce3442f3a4e86af293c1
> > Author: Randy Dunlap <rdunlap at infradead.org>
> > Date:   Mon Nov 12 09:20:49 2012 -0800
> >
> > Its a simple conflict to fix, as this is the only place of conflict.
>
> Eh? You don't know what my tree is based on. ;)
>
> What does this patch apply on top of? Which -rc?

Mfd/for-next

> --
> Lee Jones
> Linaro ST-Ericsson Landing Team Lead
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/devicetree-discuss/attachments/20121130/5afa098b/attachment.html>