Re: [GIT PULL] RTC for 4.2

[Alexandre Belloni]

On 25/06/2015 at 18:59:48 -0700, Linus Torvalds wrote :
> Looks fine, but:
> 
> > Conflicts:
> >    drivers/rtc/Makefile
> >
> > Trivial add/add conflicts with the mfd tree, solved in linux-next
> > Resolution: take both sides.
> 
> That's not the resolution I took - the re-sorting of the file made for
> more complex.
> 
> Can you check my resolution?
> 

I've checked and it is correct. Thanks!

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/