On Thursday 22 March 2012, Florian Tobias Schandinat wrote:
On 03/19/2012 04:24 PM, Arnd Bergmann wrote:
quoted
I've looked at the specific conflicts again, and it seems that the only
conflicting commit in arm-soc is 2e3ee9f45b "ARM: OMAP1: Move most of
plat/io.h into local iomap.h". I'm planning to send that one very early,
as soon as Russell has his first set up patches merged, so I don't
actually have to resolve the conflict here unless Florian is also
there early.
just for your info, I am going to send my pull request today. As I
didn't find any pull request from you until now, I didn't pull any of
the branches below.
Ok, thanks for the notification. I'm still waiting for Russell to go
first, so I'll pull in your branch.
Arnd