linux-next: manual merge of the renesas tree with the arm-soc tree
sfr at canb.auug.org.au
Wed May 21 19:12:50 PDT 2014
Today's linux-next merge of the renesas tree got a conflict in
arch/arm/boot/dts/r8a7790-lager.dts between commit 637193b2f22c ("Merge
branch 'next/boards' into for-next") from the arm-soc tree and commit
2a3bd7497db1 ("Merge branch 'heads/dt-scif-for-v3.16' into next") from
the renesas tree.
I fixed it up (I used the latter since it kept the trailing semi-colon)
and can carry the fix as necessary (no action is required).
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 836 bytes
Desc: not available
More information about the linux-arm-kernel