diff for duplicates of <4FD5E94D.1010700@gmail.com> diff --git a/a/1.txt b/N1/1.txt index c66de12..4878f11 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ On 06/10/2012 05:31 AM, Andrew Lunn wrote: -> Signed-off-by: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> +> Signed-off-by: Andrew Lunn <andrew@lunn.ch> > --- > .../devicetree/bindings/arm/mrvl/intc.txt | 20 ++++++++++++++++++ > arch/arm/boot/dts/kirkwood.dtsi | 9 ++++++++ @@ -52,7 +52,7 @@ On 06/10/2012 05:31 AM, Andrew Lunn wrote: > + <0xfed20214 0x04>; > + }; > -> ocp@f1000000 { +> ocp at f1000000 { > compatible = "simple-bus"; > diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c > index edc3f8a..fa51586 100644 @@ -87,7 +87,7 @@ But that may take some time. Rob > + return 0; -> +}rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org +> +}rob.herring at calxeda.com > + > +static const struct of_device_id kirkwood_irq_match[] = { > + { .compatible = "marvell,orion-intc", @@ -101,7 +101,7 @@ Rob > +} > + > DT_MACHINE_START(KIRKWOOD_DT, "Marvell Kirkwood (Flattened Device Tree)") -> /* Maintainer: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> */ +> /* Maintainer: Jason Cooper <jason@lakedaemon.net> */ > .map_io = kirkwood_map_io, > .init_early = kirkwood_init_early, > - .init_irq = kirkwood_init_irq, diff --git a/a/content_digest b/N1/content_digest index 4ab0e80..aae20b2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,12 @@ "ref\01339324322-29388-2-git-send-email-andrew@lunn.ch\0" - "ref\01339324322-29388-2-git-send-email-andrew-g2DYL2Zd6BY@public.gmane.org\0" - "From\0Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Subject\0Re: [PATCH 1/9] ARM: Kirkwood: Add interrupt controller support for DT boards\0" + "From\0robherring2@gmail.com (Rob Herring)\0" + "Subject\0[PATCH 1/9] ARM: Kirkwood: Add interrupt controller support for DT boards\0" "Date\0Mon, 11 Jun 2012 07:49:17 -0500\0" - "To\0Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>\0" - "Cc\0jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org" - devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org - grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org - linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org - machael-QKn5cuLxLXY@public.gmane.org - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 06/10/2012 05:31 AM, Andrew Lunn wrote:\n" - "> Signed-off-by: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>\n" + "> Signed-off-by: Andrew Lunn <andrew@lunn.ch>\n" "> ---\n" "> .../devicetree/bindings/arm/mrvl/intc.txt | 20 ++++++++++++++++++\n" "> arch/arm/boot/dts/kirkwood.dtsi | 9 ++++++++\n" @@ -67,7 +59,7 @@ "> +\t\t <0xfed20214 0x04>;\n" "> + };\n" "> \n" - "> \tocp@f1000000 {\n" + "> \tocp at f1000000 {\n" "> \t\tcompatible = \"simple-bus\";\n" "> diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c\n" "> index edc3f8a..fa51586 100644\n" @@ -102,7 +94,7 @@ "Rob\n" "\n" "> +\treturn 0;\n" - "> +}rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org\n" + "> +}rob.herring at calxeda.com\n" "> +\n" "> +static const struct of_device_id kirkwood_irq_match[] = {\n" "> +\t{ .compatible = \"marvell,orion-intc\",\n" @@ -116,7 +108,7 @@ "> +}\n" "> +\n" "> DT_MACHINE_START(KIRKWOOD_DT, \"Marvell Kirkwood (Flattened Device Tree)\")\n" - "> \t/* Maintainer: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> */\n" + "> \t/* Maintainer: Jason Cooper <jason@lakedaemon.net> */\n" "> \t.map_io\t\t= kirkwood_map_io,\n" "> \t.init_early\t= kirkwood_init_early,\n" "> -\t.init_irq\t= kirkwood_init_irq,\n" @@ -125,4 +117,4 @@ "> \t.init_machine\t= kirkwood_dt_init,\n" "> \t.restart\t= kirkwood_restart," -70ccb091276adc1487e68910fd9bbb9b797f9712e575bbe59397323ed16feb28 +a8e1ce06fcf21b2b20baa5171f8a154c90c2442d4186dfd410a9441355a84a57
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.