* Lee Jones <lee.jones@xxxxxxxxxx> [130813 08:51]: > Tony, Benoit, > > Poke Looks like Benoit's new email address is bcousson@xxxxxxxxxxxx. Probably best for Benoit to pick these to avoid merge conflicts. Regards, Tony > On Mon, 22 Jul 2013, Lee Jones wrote: > > > Cc: Benoît Cousson <b-cousson@xxxxxx> > > Cc: Tony Lindgren <tony@xxxxxxxxxxx> > > Cc: linux-omap@xxxxxxxxxxxxxxx > > Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx> > > --- > > arch/arm/boot/dts/omap2420-h4.dts | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm/boot/dts/omap2420-h4.dts b/arch/arm/boot/dts/omap2420-h4.dts > > index 224c08f..34cdecb 100644 > > --- a/arch/arm/boot/dts/omap2420-h4.dts > > +++ b/arch/arm/boot/dts/omap2420-h4.dts > > @@ -50,15 +50,15 @@ > > label = "bootloader"; > > reg = <0 0x20000>; > > }; > > - partition@0x20000 { > > + partition@20000 { > > label = "params"; > > reg = <0x20000 0x20000>; > > }; > > - partition@0x40000 { > > + partition@40000 { > > label = "kernel"; > > reg = <0x40000 0x200000>; > > }; > > - partition@0x240000 { > > + partition@240000 { > > label = "file-system"; > > reg = <0x240000 0x3dc0000>; > > }; > > -- > Lee Jones > Linaro ST-Ericsson Landing Team Lead > Linaro.org │ Open source software for ARM SoCs > Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html