On Fri, 2011-05-27 at 14:00 +1000, ext Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the mtd tree got a conflict in
> drivers/mtd/maps/physmap.c between commit b7281ca2a4b0 ("ARM: 6904/1:
> MTD: Add integrator-flash feature to physmap") from Linus' tree and
> commit 984e6d8ec5ab ("mtd: physmap: convert to mtd_device_register()")
> from the mtd tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Yes, this looks right, thanks.
--
Best Regards,
Artem Bityutskiy (ÐÑÑÑÐ ÐÐÑÑÑÐÐÐ)
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
