diff for duplicates of <20120806153503.GH10524@gmail.com> diff --git a/a/1.txt b/N1/1.txt index da98712..178d6ea 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ Looks like I introduced a merge error on the last patch. Trying again: -From: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> +From: Lee Jones <lee.jones@linaro.org> Date: Mon, 6 Aug 2012 11:04:14 +0100 Subject: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver. @@ -11,10 +11,10 @@ adds some unnecessary overhead in platform code. The configuration as already been removed from platform code, this patch checks for any over-riding configurations. If there aren't any, the default is used. -Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org -Acked-by: srinidhi kasagar <srinidhi.kasagar-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> -Acked-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> -Signed-off-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> +Cc: linux-i2c at vger.kernel.org +Acked-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com> +Acked-by: Linus Walleij <linus.walleij@linaro.org> +Signed-off-by: Lee Jones <lee.jones@linaro.org> --- .../mali/mali400ko/driver/src/devicedrv/mali/arch | 1 + drivers/i2c/busses/i2c-nomadik.c | 28 +++++++++++++------- diff --git a/a/content_digest b/N1/content_digest index 6d54cb8..4084b38 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,13 @@ "ref\01344266253-14050-1-git-send-email-lee.jones@linaro.org\0" - "ref\01344266253-14050-1-git-send-email-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" - "From\0Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "From\0lee.jones@linaro.org (Lee Jones)\0" "Subject\0[PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver.\0" "Date\0Mon, 6 Aug 2012 16:35:06 +0100\0" - "To\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" - " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" - "Cc\0STEricsson_nomadik_linux-nkJGhpqTU55BDgjK7y7TUQ@public.gmane.org" - linus.walleij-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org - arnd-r2nGTMty4D4@public.gmane.org - w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org - " linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Looks like I introduced a merge error on the last patch. Trying again:\n" "\n" - "From: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" + "From: Lee Jones <lee.jones@linaro.org>\n" "Date: Mon, 6 Aug 2012 11:04:14 +0100\n" "Subject: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C\n" " driver.\n" @@ -25,10 +18,10 @@ "as already been removed from platform code, this patch checks for any\n" "over-riding configurations. If there aren't any, the default is used.\n" "\n" - "Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" - "Acked-by: srinidhi kasagar <srinidhi.kasagar-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org>\n" - "Acked-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" - "Signed-off-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" + "Cc: linux-i2c at vger.kernel.org\n" + "Acked-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>\n" + "Acked-by: Linus Walleij <linus.walleij@linaro.org>\n" + "Signed-off-by: Lee Jones <lee.jones@linaro.org>\n" "---\n" " .../mali/mali400ko/driver/src/devicedrv/mali/arch | 1 +\n" " drivers/i2c/busses/i2c-nomadik.c | 28 +++++++++++++-------\n" @@ -100,4 +93,4 @@ "-- \n" 1.7.9.5 -efbd41eae202d106336c5bdcc7269f99ce9c2642858ba6d06d42b36851398a00 +434f5fc1e3401ce245a69e5c536cfbac4e01998324534f0dc03557c812af2e6f
diff --git a/a/1.txt b/N2/1.txt index da98712..e2272ed 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,6 +1,6 @@ Looks like I introduced a merge error on the last patch. Trying again: -From: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> +From: Lee Jones <lee.jones@linaro.org> Date: Mon, 6 Aug 2012 11:04:14 +0100 Subject: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver. @@ -11,10 +11,10 @@ adds some unnecessary overhead in platform code. The configuration as already been removed from platform code, this patch checks for any over-riding configurations. If there aren't any, the default is used. -Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org -Acked-by: srinidhi kasagar <srinidhi.kasagar-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> -Acked-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> -Signed-off-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> +Cc: linux-i2c@vger.kernel.org +Acked-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com> +Acked-by: Linus Walleij <linus.walleij@linaro.org> +Signed-off-by: Lee Jones <lee.jones@linaro.org> --- .../mali/mali400ko/driver/src/devicedrv/mali/arch | 1 + drivers/i2c/busses/i2c-nomadik.c | 28 +++++++++++++------- diff --git a/a/content_digest b/N2/content_digest index 6d54cb8..3b33772 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,20 +1,19 @@ "ref\01344266253-14050-1-git-send-email-lee.jones@linaro.org\0" - "ref\01344266253-14050-1-git-send-email-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" - "From\0Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "From\0Lee Jones <lee.jones@linaro.org>\0" "Subject\0[PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver.\0" "Date\0Mon, 6 Aug 2012 16:35:06 +0100\0" - "To\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" - " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" - "Cc\0STEricsson_nomadik_linux-nkJGhpqTU55BDgjK7y7TUQ@public.gmane.org" - linus.walleij-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org - arnd-r2nGTMty4D4@public.gmane.org - w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org - " linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org" + " linux-kernel@vger.kernel.org\0" + "Cc\0STEricsson_nomadik_linux@list.st.com" + linus.walleij@stericsson.com + arnd@arndb.de + w.sang@pengutronix.de + " linux-i2c@vger.kernel.org\0" "\00:1\0" "b\0" "Looks like I introduced a merge error on the last patch. Trying again:\n" "\n" - "From: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" + "From: Lee Jones <lee.jones@linaro.org>\n" "Date: Mon, 6 Aug 2012 11:04:14 +0100\n" "Subject: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C\n" " driver.\n" @@ -25,10 +24,10 @@ "as already been removed from platform code, this patch checks for any\n" "over-riding configurations. If there aren't any, the default is used.\n" "\n" - "Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" - "Acked-by: srinidhi kasagar <srinidhi.kasagar-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org>\n" - "Acked-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" - "Signed-off-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" + "Cc: linux-i2c@vger.kernel.org\n" + "Acked-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>\n" + "Acked-by: Linus Walleij <linus.walleij@linaro.org>\n" + "Signed-off-by: Lee Jones <lee.jones@linaro.org>\n" "---\n" " .../mali/mali400ko/driver/src/devicedrv/mali/arch | 1 +\n" " drivers/i2c/busses/i2c-nomadik.c | 28 +++++++++++++-------\n" @@ -100,4 +99,4 @@ "-- \n" 1.7.9.5 -efbd41eae202d106336c5bdcc7269f99ce9c2642858ba6d06d42b36851398a00 +1bd00be911d3a39a598a33cac35fee2bcbae0220355618128bcdbfa962b8b9c7
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.