diff for duplicates of <20151217233050.GA16016@dtor-ws> diff --git a/a/1.txt b/N1/1.txt index 9ce5cd4..5cedaa4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,14 +9,14 @@ On Mon, Dec 14, 2015 at 02:53:52PM +0100, Markus Pargmann wrote: > settings in the core driver and setup a idle configuration with touch > detection. > -> Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> -> Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> +> Signed-off-by: Markus Pargmann <mpa@pengutronix.de> +> Signed-off-by: Denis Carikli <denis@eukrea.com> > > [fix clock's period calculation] > [fix calculation of the 'settling' value] -> Signed-off-by: Juergen Borleis <jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> Signed-off-by: Juergen Borleis <jbe@pengutronix.de> -Acked-by: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Please merge with the rest of this MFD device. @@ -85,14 +85,14 @@ Please merge with the rest of this MFD device. > +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c > @@ -0,0 +1,596 @@ > +/* -> + * Copyright (C) 2014-2015 Pengutronix, Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> + * Copyright (C) 2014-2015 Pengutronix, Markus Pargmann <mpa@pengutronix.de> > + * > + * This program is free software; you can redistribute it and/or modify it under > + * the terms of the GNU General Public License version 2 as published by the > + * Free Software Foundation. > + * > + * Based on driver from 2011: -> + * Juergen Beisert, Pengutronix <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> + * Juergen Beisert, Pengutronix <kernel@pengutronix.de> > + * > + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) > + * connected to the imx25 ADC. @@ -678,7 +678,7 @@ Please merge with the rest of this MFD device. > +module_platform_driver(mx25_tcq_driver); > + > +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); -> +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); +> +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > -- > 2.6.2 diff --git a/a/content_digest b/N1/content_digest index 7e291cf..9789ffb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,22 @@ "ref\01450101234-2191-1-git-send-email-mpa@pengutronix.de\0" "ref\01450101234-2191-7-git-send-email-mpa@pengutronix.de\0" - "ref\01450101234-2191-7-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org\0" - "From\0Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "From\0Dmitry Torokhov <dmitry.torokhov@gmail.com>\0" "Subject\0Re: [PATCH v10 6/8] input: touchscreen: imx25 tcq driver\0" "Date\0Thu, 17 Dec 2015 15:30:50 -0800\0" - "To\0Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\0" - "Cc\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" - Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> - Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> - " Eric B\303\251nard <eric-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>" - Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - Hartmut Knaack <knaack.h-Mmb7MZpHnFY@public.gmane.org> - Fabio Estevam <festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - " Juergen Borleis <jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\0" + "To\0Markus Pargmann <mpa@pengutronix.de>\0" + "Cc\0Shawn Guo <shawnguo@kernel.org>" + Jonathan Cameron <jic23@kernel.org> + Lee Jones <lee.jones@linaro.org> + Denis Carikli <denis@eukrea.com> + " Eric B\303\251nard <eric@eukrea.com>" + Sascha Hauer <kernel@pengutronix.de> + devicetree@vger.kernel.org + linux-input@vger.kernel.org + linux-iio@vger.kernel.org + linux-arm-kernel@lists.infradead.org + Hartmut Knaack <knaack.h@gmx.de> + Fabio Estevam <festevam@gmail.com> + " Juergen Borleis <jbe@pengutronix.de>\0" "\00:1\0" "b\0" "On Mon, Dec 14, 2015 at 02:53:52PM +0100, Markus Pargmann wrote:\n" @@ -31,14 +30,14 @@ "> settings in the core driver and setup a idle configuration with touch\n" "> detection.\n" "> \n" - "> Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" - "> Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>\n" + "> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>\n" + "> Signed-off-by: Denis Carikli <denis@eukrea.com>\n" "> \n" "> [fix clock's period calculation]\n" "> [fix calculation of the 'settling' value]\n" - "> Signed-off-by: Juergen Borleis <jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> Signed-off-by: Juergen Borleis <jbe@pengutronix.de>\n" "\n" - "Acked-by: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + "Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>\n" "\n" "Please merge with the rest of this MFD device.\n" "\n" @@ -107,14 +106,14 @@ "> +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c\n" "> @@ -0,0 +1,596 @@\n" "> +/*\n" - "> + * Copyright (C) 2014-2015 Pengutronix, Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> + * Copyright (C) 2014-2015 Pengutronix, Markus Pargmann <mpa@pengutronix.de>\n" "> + *\n" "> + * This program is free software; you can redistribute it and/or modify it under\n" "> + * the terms of the GNU General Public License version 2 as published by the\n" "> + * Free Software Foundation.\n" "> + *\n" "> + * Based on driver from 2011:\n" - "> + * Juergen Beisert, Pengutronix <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> + * Juergen Beisert, Pengutronix <kernel@pengutronix.de>\n" "> + *\n" "> + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue)\n" "> + * connected to the imx25 ADC.\n" @@ -700,7 +699,7 @@ "> +module_platform_driver(mx25_tcq_driver);\n" "> +\n" "> +MODULE_DESCRIPTION(\"TS input driver for Freescale mx25\");\n" - "> +MODULE_AUTHOR(\"Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\");\n" + "> +MODULE_AUTHOR(\"Markus Pargmann <mpa@pengutronix.de>\");\n" "> +MODULE_LICENSE(\"GPL v2\");\n" "> -- \n" "> 2.6.2\n" @@ -709,4 +708,4 @@ "-- \n" Dmitry -202c4621e0a02dcc65f19e74d3341199947f5bdf5fd48da5bea213ec0457ad33 +7812c3ccec40a998d8da4fd0e7234724727ee4e2e5ef7ff5a3afa8074f584ac7
diff --git a/a/1.txt b/N2/1.txt index 9ce5cd4..5cedaa4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -9,14 +9,14 @@ On Mon, Dec 14, 2015 at 02:53:52PM +0100, Markus Pargmann wrote: > settings in the core driver and setup a idle configuration with touch > detection. > -> Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> -> Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> +> Signed-off-by: Markus Pargmann <mpa@pengutronix.de> +> Signed-off-by: Denis Carikli <denis@eukrea.com> > > [fix clock's period calculation] > [fix calculation of the 'settling' value] -> Signed-off-by: Juergen Borleis <jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> Signed-off-by: Juergen Borleis <jbe@pengutronix.de> -Acked-by: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Please merge with the rest of this MFD device. @@ -85,14 +85,14 @@ Please merge with the rest of this MFD device. > +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c > @@ -0,0 +1,596 @@ > +/* -> + * Copyright (C) 2014-2015 Pengutronix, Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> + * Copyright (C) 2014-2015 Pengutronix, Markus Pargmann <mpa@pengutronix.de> > + * > + * This program is free software; you can redistribute it and/or modify it under > + * the terms of the GNU General Public License version 2 as published by the > + * Free Software Foundation. > + * > + * Based on driver from 2011: -> + * Juergen Beisert, Pengutronix <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> + * Juergen Beisert, Pengutronix <kernel@pengutronix.de> > + * > + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) > + * connected to the imx25 ADC. @@ -678,7 +678,7 @@ Please merge with the rest of this MFD device. > +module_platform_driver(mx25_tcq_driver); > + > +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); -> +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); +> +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > -- > 2.6.2 diff --git a/a/content_digest b/N2/content_digest index 7e291cf..0d4e1c0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,23 +1,9 @@ "ref\01450101234-2191-1-git-send-email-mpa@pengutronix.de\0" "ref\01450101234-2191-7-git-send-email-mpa@pengutronix.de\0" - "ref\01450101234-2191-7-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org\0" - "From\0Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Subject\0Re: [PATCH v10 6/8] input: touchscreen: imx25 tcq driver\0" + "From\0dmitry.torokhov@gmail.com (Dmitry Torokhov)\0" + "Subject\0[PATCH v10 6/8] input: touchscreen: imx25 tcq driver\0" "Date\0Thu, 17 Dec 2015 15:30:50 -0800\0" - "To\0Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\0" - "Cc\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" - Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> - Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> - " Eric B\303\251nard <eric-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>" - Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - Hartmut Knaack <knaack.h-Mmb7MZpHnFY@public.gmane.org> - Fabio Estevam <festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - " Juergen Borleis <jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, Dec 14, 2015 at 02:53:52PM +0100, Markus Pargmann wrote:\n" @@ -31,14 +17,14 @@ "> settings in the core driver and setup a idle configuration with touch\n" "> detection.\n" "> \n" - "> Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" - "> Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>\n" + "> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>\n" + "> Signed-off-by: Denis Carikli <denis@eukrea.com>\n" "> \n" "> [fix clock's period calculation]\n" "> [fix calculation of the 'settling' value]\n" - "> Signed-off-by: Juergen Borleis <jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> Signed-off-by: Juergen Borleis <jbe@pengutronix.de>\n" "\n" - "Acked-by: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + "Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>\n" "\n" "Please merge with the rest of this MFD device.\n" "\n" @@ -107,14 +93,14 @@ "> +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c\n" "> @@ -0,0 +1,596 @@\n" "> +/*\n" - "> + * Copyright (C) 2014-2015 Pengutronix, Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> + * Copyright (C) 2014-2015 Pengutronix, Markus Pargmann <mpa@pengutronix.de>\n" "> + *\n" "> + * This program is free software; you can redistribute it and/or modify it under\n" "> + * the terms of the GNU General Public License version 2 as published by the\n" "> + * Free Software Foundation.\n" "> + *\n" "> + * Based on driver from 2011:\n" - "> + * Juergen Beisert, Pengutronix <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> + * Juergen Beisert, Pengutronix <kernel@pengutronix.de>\n" "> + *\n" "> + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue)\n" "> + * connected to the imx25 ADC.\n" @@ -700,7 +686,7 @@ "> +module_platform_driver(mx25_tcq_driver);\n" "> +\n" "> +MODULE_DESCRIPTION(\"TS input driver for Freescale mx25\");\n" - "> +MODULE_AUTHOR(\"Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\");\n" + "> +MODULE_AUTHOR(\"Markus Pargmann <mpa@pengutronix.de>\");\n" "> +MODULE_LICENSE(\"GPL v2\");\n" "> -- \n" "> 2.6.2\n" @@ -709,4 +695,4 @@ "-- \n" Dmitry -202c4621e0a02dcc65f19e74d3341199947f5bdf5fd48da5bea213ec0457ad33 +8200d84fe4128f46694659ee26bf2b883ca22c833c4c793c4da7b1778bd9d0f0
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.