diff for duplicates of <52B315B4.6000906@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 511e56c..28beedd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,9 +1,9 @@ On 17/12/2013 16:54, Boris BREZILLON : > Document the clock properties required by the at91 i2c bus driver. > -> Signed-off-by: Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org> +> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> -Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> +Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > Documentation/devicetree/bindings/i2c/i2c-at91.txt | 2 ++ @@ -21,13 +21,13 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > > Optional properties: > - Child nodes conforming to i2c bus binding -> @@ -21,6 +22,7 @@ i2c0: i2c@fff84000 { +> @@ -21,6 +22,7 @@ i2c0: i2c at fff84000 { > interrupts = <12 4 6>; > #address-cells = <1>; > #size-cells = <0>; > + clocks = <&twi0_clk>; > -> 24c512@50 { +> 24c512 at 50 { > compatible = "24c512"; > diff --git a/a/content_digest b/N1/content_digest index 4e83d89..70e59fe 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,27 +1,16 @@ "ref\01387295644-7382-1-git-send-email-b.brezillon@overkiz.com\0" - "ref\01387295644-7382-1-git-send-email-b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org\0" - "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" - "Subject\0Re: [PATCH] i2c: at91: document clock properties\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[PATCH] i2c: at91: document clock properties\0" "Date\0Thu, 19 Dec 2013 16:50:12 +0100\0" - "To\0Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>" - Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> - " Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>\0" - "Cc\0Rob Landley <rob-VoJi6FS/r0vR7s880joybQ@public.gmane.org>" - Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> - Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - " linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 17/12/2013 16:54, Boris BREZILLON :\n" "> Document the clock properties required by the at91 i2c bus driver.\n" "> \n" - "> Signed-off-by: Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>\n" + "> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>\n" "\n" - "Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" + "Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>\n" "\n" "> ---\n" "> Documentation/devicetree/bindings/i2c/i2c-at91.txt | 2 ++\n" @@ -39,13 +28,13 @@ "> \n" "> Optional properties:\n" "> - Child nodes conforming to i2c bus binding\n" - "> @@ -21,6 +22,7 @@ i2c0: i2c@fff84000 {\n" + "> @@ -21,6 +22,7 @@ i2c0: i2c at fff84000 {\n" "> \tinterrupts = <12 4 6>;\n" "> \t#address-cells = <1>;\n" "> \t#size-cells = <0>;\n" "> +\tclocks = <&twi0_clk>;\n" "> \n" - "> \t24c512@50 {\n" + "> \t24c512 at 50 {\n" "> \t\tcompatible = \"24c512\";\n" "> \n" "\n" @@ -53,4 +42,4 @@ "-- \n" Nicolas Ferre -4032aedf8553692e9c79c6cf85e7192a0085b00d075ddbbeb23486fea90e3418 +fedebdc11c0d95af72dfe568c5a7382b3560b623274793d6da6142d2447f6c05
diff --git a/a/1.txt b/N2/1.txt index 511e56c..e4a81da 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,9 +1,9 @@ On 17/12/2013 16:54, Boris BREZILLON : > Document the clock properties required by the at91 i2c bus driver. > -> Signed-off-by: Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org> +> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> -Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> +Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > Documentation/devicetree/bindings/i2c/i2c-at91.txt | 2 ++ diff --git a/a/content_digest b/N2/content_digest index 4e83d89..a4edba3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,27 @@ "ref\01387295644-7382-1-git-send-email-b.brezillon@overkiz.com\0" - "ref\01387295644-7382-1-git-send-email-b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org\0" - "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" "Subject\0Re: [PATCH] i2c: at91: document clock properties\0" "Date\0Thu, 19 Dec 2013 16:50:12 +0100\0" - "To\0Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>" - Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> - " Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>\0" - "Cc\0Rob Landley <rob-VoJi6FS/r0vR7s880joybQ@public.gmane.org>" - Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> - Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - " linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0Boris BREZILLON <b.brezillon@overkiz.com>" + Ludovic Desroches <ludovic.desroches@atmel.com> + Wolfram Sang <wsa@the-dreams.de> + " Wolfram Sang <wsa@the-dreams.de>\0" + "Cc\0Rob Landley <rob@landley.net>" + Arnd Bergmann <arnd@arndb.de> + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + <devicetree@vger.kernel.org> + <linux-doc@vger.kernel.org> + <linux-kernel@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + " <linux-i2c@vger.kernel.org>\0" "\00:1\0" "b\0" "On 17/12/2013 16:54, Boris BREZILLON :\n" "> Document the clock properties required by the at91 i2c bus driver.\n" "> \n" - "> Signed-off-by: Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>\n" + "> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>\n" "\n" - "Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" + "Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>\n" "\n" "> ---\n" "> Documentation/devicetree/bindings/i2c/i2c-at91.txt | 2 ++\n" @@ -53,4 +53,4 @@ "-- \n" Nicolas Ferre -4032aedf8553692e9c79c6cf85e7192a0085b00d075ddbbeb23486fea90e3418 +718c49a7b8b99f0b769121dbe510da30148b63c58ffd98579b663edc536ebeda
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.