linux-next: manual merge of the renesas tree with Linus' tree
sfr at canb.auug.org.au
Wed May 15 23:22:53 EDT 2013
Today's linux-next merge of the renesas tree got a conflict in
arch/arm/mach-shmobile/board-lager.c between commit 65be2de17aae ("ARM:
shmobile: use r8a7790 timer setup code on Lager") from Linus' tree and
commit 993340a1390d ("ARM: shmobile: use r8a7790 timer setup code on
Lager") from the renesas tree.
These are the same patch but different commits :-( and there are further
commits touching this file in the renesas tree. Please clean up your
tree and remove anything that has already gone upstream as different
patches. I used the renesas tree version of this file.
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 836 bytes
Desc: not available
More information about the linux-arm-kernel