Hi Simon,
Today's linux-next merge of the renesas tree got conflicts in:
arch/arm/mach-shmobile/board-marzen-reference.c and
arch/arm/mach-shmobile/board-marzen.c
between commit:
3017a8804ada ("ARM: appropriate __init annotation for const data")
from the arm-soc tree and commits:
d2fb6bdaffc7 ("ARM: shmobile: marzen-reference: Remove C board code")
9d35777f2b96 ("ARM: shmobile: marzen: Remove legacy board code")
from the renesas tree.
I fixed it up (I just removed the 2 files) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell [email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
