Subject: [PATCH] ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files

From: [email-masked] (Arnd Bergmann)
Date: Fri, 18 May 2012 13:03:28 +0000

On Thursday 17 May 2012, Stephen Rothwell wrote:
> On Thu, 17 May 2012 08:06:01 -0700 Greg KH <[email-masked]> wrote:
> >
> > On Wed, May 16, 2012 at 06:50:54PM +0000, Arnd Bergmann wrote:
> > > On Wednesday 16 May 2012, Nicolas Ferre wrote:
> > > > Now that the bulk of at91sam9g20-related nodes are located in at91sam9260.dtsi,
> > > > we have to re-create the path to this ADC node for SoC specific parts.
> > > > 
> > > > Signed-off-by: Nicolas Ferre <[email-masked]>
> > > 
> > > Should we apply this patch in arm-soc so that Greg can drop the hunk that
> > > no longer applies?
> > 
> > It's not a "no longer applies", it's a "this does not merge".  The patch
> > is in my tree, unless you want me to revert it, it's going to stay there
> > until it goes to Linus.
> 
> Just apply the patch to the arm-soc tree - then the merge resolution
> becomes "use the arm-soc version".   There is no need for Greg to revert
> the other patch.
> 

Yes, good point.

I've applied the patch on the at91/dt branch now.

	Arnd