diff for duplicates of <504E168C.6060603@ti.com> diff --git a/a/1.txt b/N1/1.txt index 008e54f..484d812 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ Benoit > -> Signed-off-by: Matt Porter <mporter-l0cyMroinI0@public.gmane.org> +> Signed-off-by: Matt Porter <mporter@ti.com> > --- > arch/arm/boot/dts/am33xx.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) @@ -32,8 +32,8 @@ Benoit > reg = <0x48200000 0x1000>; > }; > -> - gpio1: gpio@44e07000 { -> + gpio0: gpio@44e07000 { +> - gpio1: gpio at 44e07000 { +> + gpio0: gpio at 44e07000 { > compatible = "ti,omap4-gpio"; > ti,hwmods = "gpio1"; > gpio-controller; @@ -41,8 +41,8 @@ Benoit > interrupts = <96>; > }; > -> - gpio2: gpio@4804c000 { -> + gpio1: gpio@4804c000 { +> - gpio2: gpio at 4804c000 { +> + gpio1: gpio at 4804c000 { > compatible = "ti,omap4-gpio"; > ti,hwmods = "gpio2"; > gpio-controller; @@ -50,8 +50,8 @@ Benoit > interrupts = <98>; > }; > -> - gpio3: gpio@481ac000 { -> + gpio2: gpio@481ac000 { +> - gpio3: gpio at 481ac000 { +> + gpio2: gpio at 481ac000 { > compatible = "ti,omap4-gpio"; > ti,hwmods = "gpio3"; > gpio-controller; @@ -59,8 +59,8 @@ Benoit > interrupts = <32>; > }; > -> - gpio4: gpio@481ae000 { -> + gpio3: gpio@481ae000 { +> - gpio4: gpio at 481ae000 { +> + gpio3: gpio at 481ae000 { > compatible = "ti,omap4-gpio"; > ti,hwmods = "gpio4"; > gpio-controller; diff --git a/a/content_digest b/N1/content_digest index 62302c6..635d204 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,8 @@ "ref\01347294020-22661-1-git-send-email-mporter@ti.com\0" - "ref\01347294020-22661-1-git-send-email-mporter-l0cyMroinI0@public.gmane.org\0" - "From\0Benoit Cousson <b-cousson-l0cyMroinI0@public.gmane.org>\0" - "Subject\0Re: [PATCH] ARM: dts: AM33XX: fix gpio node numbering to match hardware\0" + "From\0b-cousson@ti.com (Benoit Cousson)\0" + "Subject\0[PATCH] ARM: dts: AM33XX: fix gpio node numbering to match hardware\0" "Date\0Mon, 10 Sep 2012 18:34:20 +0200\0" - "To\0Matt Porter <mporter-l0cyMroinI0@public.gmane.org>\0" - "Cc\0Devicetree Discuss <devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org>" - Linux Kernel Mailing List <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - Linux OMAP List <linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - " Linux ARM Kernel List <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "+ Tony\n" @@ -31,7 +26,7 @@ "\n" "\n" "> \n" - "> Signed-off-by: Matt Porter <mporter-l0cyMroinI0@public.gmane.org>\n" + "> Signed-off-by: Matt Porter <mporter@ti.com>\n" "> ---\n" "> arch/arm/boot/dts/am33xx.dtsi | 8 ++++----\n" "> 1 file changed, 4 insertions(+), 4 deletions(-)\n" @@ -44,8 +39,8 @@ "> \t\t\treg = <0x48200000 0x1000>;\n" "> \t\t};\n" "> \n" - "> -\t\tgpio1: gpio@44e07000 {\n" - "> +\t\tgpio0: gpio@44e07000 {\n" + "> -\t\tgpio1: gpio at 44e07000 {\n" + "> +\t\tgpio0: gpio at 44e07000 {\n" "> \t\t\tcompatible = \"ti,omap4-gpio\";\n" "> \t\t\tti,hwmods = \"gpio1\";\n" "> \t\t\tgpio-controller;\n" @@ -53,8 +48,8 @@ "> \t\t\tinterrupts = <96>;\n" "> \t\t};\n" "> \n" - "> -\t\tgpio2: gpio@4804c000 {\n" - "> +\t\tgpio1: gpio@4804c000 {\n" + "> -\t\tgpio2: gpio at 4804c000 {\n" + "> +\t\tgpio1: gpio at 4804c000 {\n" "> \t\t\tcompatible = \"ti,omap4-gpio\";\n" "> \t\t\tti,hwmods = \"gpio2\";\n" "> \t\t\tgpio-controller;\n" @@ -62,8 +57,8 @@ "> \t\t\tinterrupts = <98>;\n" "> \t\t};\n" "> \n" - "> -\t\tgpio3: gpio@481ac000 {\n" - "> +\t\tgpio2: gpio@481ac000 {\n" + "> -\t\tgpio3: gpio at 481ac000 {\n" + "> +\t\tgpio2: gpio at 481ac000 {\n" "> \t\t\tcompatible = \"ti,omap4-gpio\";\n" "> \t\t\tti,hwmods = \"gpio3\";\n" "> \t\t\tgpio-controller;\n" @@ -71,11 +66,11 @@ "> \t\t\tinterrupts = <32>;\n" "> \t\t};\n" "> \n" - "> -\t\tgpio4: gpio@481ae000 {\n" - "> +\t\tgpio3: gpio@481ae000 {\n" + "> -\t\tgpio4: gpio at 481ae000 {\n" + "> +\t\tgpio3: gpio at 481ae000 {\n" "> \t\t\tcompatible = \"ti,omap4-gpio\";\n" "> \t\t\tti,hwmods = \"gpio4\";\n" "> \t\t\tgpio-controller;\n" > -787e58913ebe26b910187ac82af6fdf107412c533953fa16d1b20af5ed17cb9b +7734c93149dae224083c9c19ff94e899f749dbf501d694340589dfb6ddcc28df
diff --git a/a/1.txt b/N2/1.txt index 008e54f..1324cec 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -19,7 +19,7 @@ Benoit > -> Signed-off-by: Matt Porter <mporter-l0cyMroinI0@public.gmane.org> +> Signed-off-by: Matt Porter <mporter@ti.com> > --- > arch/arm/boot/dts/am33xx.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/a/content_digest b/N2/content_digest index 62302c6..f0f8944 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,14 @@ "ref\01347294020-22661-1-git-send-email-mporter@ti.com\0" - "ref\01347294020-22661-1-git-send-email-mporter-l0cyMroinI0@public.gmane.org\0" - "From\0Benoit Cousson <b-cousson-l0cyMroinI0@public.gmane.org>\0" + "From\0Benoit Cousson <b-cousson@ti.com>\0" "Subject\0Re: [PATCH] ARM: dts: AM33XX: fix gpio node numbering to match hardware\0" "Date\0Mon, 10 Sep 2012 18:34:20 +0200\0" - "To\0Matt Porter <mporter-l0cyMroinI0@public.gmane.org>\0" - "Cc\0Devicetree Discuss <devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org>" - Linux Kernel Mailing List <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - Linux OMAP List <linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - " Linux ARM Kernel List <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0" + "To\0Matt Porter <mporter@ti.com>\0" + "Cc\0Linux OMAP List <linux-omap@vger.kernel.org>" + Linux ARM Kernel List <linux-arm-kernel@lists.infradead.org> + Devicetree Discuss <devicetree-discuss@lists.ozlabs.org> + Linux Kernel Mailing List <linux-kernel@vger.kernel.org> + Vaibhav Hiremath <hvaibhav@ti.com> + " tony@atomide.com <tony@atomide.com>\0" "\00:1\0" "b\0" "+ Tony\n" @@ -31,7 +32,7 @@ "\n" "\n" "> \n" - "> Signed-off-by: Matt Porter <mporter-l0cyMroinI0@public.gmane.org>\n" + "> Signed-off-by: Matt Porter <mporter@ti.com>\n" "> ---\n" "> arch/arm/boot/dts/am33xx.dtsi | 8 ++++----\n" "> 1 file changed, 4 insertions(+), 4 deletions(-)\n" @@ -78,4 +79,4 @@ "> \t\t\tgpio-controller;\n" > -787e58913ebe26b910187ac82af6fdf107412c533953fa16d1b20af5ed17cb9b +899741bfe1a8b3a32005611924976e368264feb4cf61ba92c6deac0c963c36a6
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.