diff for duplicates of <1350893615-14723-1-git-send-email-linux@prisktech.co.nz> diff --git a/a/1.txt b/N1/1.txt index 53fd95f..ddccfa0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ make use of the common clock subsystem. A binding document describing the PWM controller found on arch-vt8500 is also included. -Signed-off-by: Tony Prisk <linux@prisktech.co.nz> +Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> --- v2 changes: Merged binding doc patch with main code patch @@ -32,7 +32,7 @@ index 0000000..bcc6367 + +Example: + -+pwm1: pwm at d8220000 { ++pwm1: pwm@d8220000 { + #pwm-cells = <2>; + compatible = "via,vt8500-pwm"; + reg = <0xd8220000 0x1000>; @@ -46,9 +46,9 @@ index ad14389..36fef69 100644 /* * drivers/pwm/pwm-vt8500.c * -- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> -+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz> -+ * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> +- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> ++ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> ++ * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -218,7 +218,7 @@ index ad14389..36fef69 100644 -MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("VT8500 PWM Driver"); -+MODULE_AUTHOR("Tony Prisk <linux@prisktech.co.nz>"); ++MODULE_AUTHOR("Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>"); +MODULE_LICENSE("GPL v2"); -- 1.7.9.5 diff --git a/a/content_digest b/N1/content_digest index 9889e6f..2641fa1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,13 @@ "ref\020121022080414.GB4931@avionic-0098.mockup.avionic-design.de\0" - "From\0linux@prisktech.co.nz (Tony Prisk)\0" + "ref\020121022080414.GB4931-RM9K5IK7kjIQXX3q8xo1gnVAuStQJXxyR5q1nwbD4aMs9pC9oP6+/A@public.gmane.org\0" + "From\0Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\0" "Subject\0[PATCH v2] pwm: vt8500: Update vt8500 PWM driver support\0" "Date\0Mon, 22 Oct 2012 21:13:35 +1300\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0thierry.reding-RM9K5IK7kjKj5M59NBduVrNAH6kLmebB@public.gmane.org\0" + "Cc\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org" + arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "This patch updates pwm-vt8500.c to support devicetree probing and\n" @@ -11,7 +16,7 @@ "A binding document describing the PWM controller found on\n" "arch-vt8500 is also included.\n" "\n" - "Signed-off-by: Tony Prisk <linux@prisktech.co.nz>\n" + "Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\n" "---\n" "v2 changes:\n" "Merged binding doc patch with main code patch\n" @@ -39,7 +44,7 @@ "+\n" "+Example:\n" "+\n" - "+pwm1: pwm at d8220000 {\n" + "+pwm1: pwm@d8220000 {\n" "+\t#pwm-cells = <2>;\n" "+\tcompatible = \"via,vt8500-pwm\";\n" "+\treg = <0xd8220000 0x1000>;\n" @@ -53,9 +58,9 @@ " /*\n" " * drivers/pwm/pwm-vt8500.c\n" " *\n" - "- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" - "+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>\n" - "+ * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + "+ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\n" + "+ * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" " *\n" " * This software is licensed under the terms of the GNU General Public\n" " * License version 2, as published by the Free Software Foundation, and\n" @@ -225,9 +230,9 @@ " \n" "-MODULE_LICENSE(\"GPL\");\n" "+MODULE_DESCRIPTION(\"VT8500 PWM Driver\");\n" - "+MODULE_AUTHOR(\"Tony Prisk <linux@prisktech.co.nz>\");\n" + "+MODULE_AUTHOR(\"Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\");\n" "+MODULE_LICENSE(\"GPL v2\");\n" "-- \n" 1.7.9.5 -87e1bc71f5a918b39d86a2df80f93c41d9384edf7f757d5ce1c7ae7a42027d5f +b80077a5ed35f552fc36b3d2986e795c1b85e619b478ff6d0a20b3deaf0f35b3
diff --git a/a/1.txt b/N2/1.txt index 53fd95f..2b414c0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -32,7 +32,7 @@ index 0000000..bcc6367 + +Example: + -+pwm1: pwm at d8220000 { ++pwm1: pwm@d8220000 { + #pwm-cells = <2>; + compatible = "via,vt8500-pwm"; + reg = <0xd8220000 0x1000>; diff --git a/a/content_digest b/N2/content_digest index 9889e6f..e84ca48 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,13 @@ "ref\020121022080414.GB4931@avionic-0098.mockup.avionic-design.de\0" - "From\0linux@prisktech.co.nz (Tony Prisk)\0" + "From\0Tony Prisk <linux@prisktech.co.nz>\0" "Subject\0[PATCH v2] pwm: vt8500: Update vt8500 PWM driver support\0" "Date\0Mon, 22 Oct 2012 21:13:35 +1300\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0thierry.reding@avionic-design.de\0" + "Cc\0devicetree-discuss@lists.ozlabs.org" + arm@kernel.org + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " Tony Prisk <linux@prisktech.co.nz>\0" "\00:1\0" "b\0" "This patch updates pwm-vt8500.c to support devicetree probing and\n" @@ -39,7 +44,7 @@ "+\n" "+Example:\n" "+\n" - "+pwm1: pwm at d8220000 {\n" + "+pwm1: pwm@d8220000 {\n" "+\t#pwm-cells = <2>;\n" "+\tcompatible = \"via,vt8500-pwm\";\n" "+\treg = <0xd8220000 0x1000>;\n" @@ -230,4 +235,4 @@ "-- \n" 1.7.9.5 -87e1bc71f5a918b39d86a2df80f93c41d9384edf7f757d5ce1c7ae7a42027d5f +1a5539b0e18562200bc9e7a7161cdacef4995dc93ebae47c875f2fffd48c63c6
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.