diff for duplicates of <1314315824-9687-6-git-send-email-swarren@nvidia.com>
diff --git a/a/1.txt b/N1/1.txt
index 86f0294..7e97793 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,7 +3,7 @@ pinmux device. Add pinmux nodes to Harmony and Seaboard, which detail
the entire initial pinmux configuration. This configuration is identical
to that in board-harmony/seaboard-pinmux.c.
-Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
+Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
arch/arm/boot/dts/tegra-harmony.dts | 243 ++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/tegra-seaboard.dts | 239 +++++++++++++++++++++++++++++++++
diff --git a/a/content_digest b/N1/content_digest
index d26f27d..c0ca49f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,10 +2,7 @@
"ref\0001314315824-9687-1-git-send-email-swarren\@nvidia.com\0"
]
[
- "ref\0001314315824-9687-1-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org\0"
-]
-[
- "From\0Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org>\0"
+ "From\0Stephen Warren <swarren\@nvidia.com>\0"
]
[
"Subject\0[PATCH v3 05/13] arm/dt: Tegra: Add pinmux node\0"
@@ -14,20 +11,24 @@
"Date\0Thu, 25 Aug 2011 17:43:36 -0600\0"
]
[
- "To\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ\@public.gmane.org>",
- " Colin Cross <ccross-z5hGa2qSFaRBDgjK7y7TUQ\@public.gmane.org>",
- " Erik Gilling <konkers-z5hGa2qSFaRBDgjK7y7TUQ\@public.gmane.org>",
- " Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w\@public.gmane.org>\0"
+ "To\0Grant Likely <grant.likely\@secretlab.ca>",
+ " Colin Cross <ccross\@android.com>",
+ " Erik Gilling <konkers\@android.com>",
+ " Olof Johansson <olof\@lixom.net>\0"
]
[
- "Cc\0Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ\@public.gmane.org>",
- " Sergei Shtylyov <sshtylyov-Igf4POYTYCDQT0dZR+AlfA\@public.gmane.org>",
- " Belisko Marek <marek.belisko-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
- " devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ\@public.gmane.org",
- " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
- " linux-tegra-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
- " Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org\0"
+ "Cc\0Russell King <linux\@arm.linux.org.uk>",
+ " Arnd Bergmann <arnd\@arndb.de>",
+ " devicetree-discuss\@lists.ozlabs.org",
+ " linux-tegra\@vger.kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " linux-kernel\@vger.kernel.org",
+ " Belisko Marek <marek.belisko\@gmail.com>",
+ " Jamie Iles <jamie\@jamieiles.com>",
+ " Shawn Guo <shawn.guo\@freescale.com>",
+ " Sergei Shtylyov <sshtylyov\@mvista.com>",
+ " Linus Walleij <linus.walleij\@linaro.org>",
+ " Stephen Warren <swarren\@nvidia.com>\0"
]
[
"\0000:1\0"
@@ -41,7 +42,7 @@
"the entire initial pinmux configuration. This configuration is identical\n",
"to that in board-harmony/seaboard-pinmux.c.\n",
"\n",
- "Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org>\n",
+ "Signed-off-by: Stephen Warren <swarren\@nvidia.com>\n",
"---\n",
" arch/arm/boot/dts/tegra-harmony.dts | 243 ++++++++++++++++++++++++++++++++++\n",
" arch/arm/boot/dts/tegra-seaboard.dts | 239 +++++++++++++++++++++++++++++++++\n",
@@ -572,4 +573,4 @@
"1.7.0.4"
]
-ef49bf83cec5b2d95536261fa9f77964ee4733efd8036172a70744af19977c6e
+236e2fe70e4c7e023fc279b6c6e3d15e9a8abee9510739848708998dafa82a0f
diff --git a/a/1.txt b/N2/1.txt
index 86f0294..12dcefd 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -3,7 +3,7 @@ pinmux device. Add pinmux nodes to Harmony and Seaboard, which detail
the entire initial pinmux configuration. This configuration is identical
to that in board-harmony/seaboard-pinmux.c.
-Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
+Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
arch/arm/boot/dts/tegra-harmony.dts | 243 ++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/tegra-seaboard.dts | 239 +++++++++++++++++++++++++++++++++
@@ -18,7 +18,7 @@ index 2bbe559..a2b8dec 100644
>;
};
-+ pinmux: pinmux@70000000 {
++ pinmux: pinmux at 70000000 {
+ nvidia,mux-groups {
+ ata {
+ pins = "ata";
@@ -261,7 +261,7 @@ index 2bbe559..a2b8dec 100644
+ };
+ };
+
- i2c@7000c000 {
+ i2c at 7000c000 {
clock-frequency = <400000>;
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -272,7 +272,7 @@ index ec8f8cf..b0677b2 100644
>;
};
-+ pinmux: pinmux@70000000 {
++ pinmux: pinmux at 70000000 {
+ nvidia,mux-groups {
+ ata {
+ pins = "ata";
@@ -511,7 +511,7 @@ index ec8f8cf..b0677b2 100644
+ };
+ };
+
- serial@70006300 {
+ serial at 70006300 {
clock-frequency = < 216000000 >;
};
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
@@ -522,12 +522,12 @@ index 5727595..5921c1d 100644
gpio-controller;
};
-+ pinmux: pinmux@70000000 {
++ pinmux: pinmux at 70000000 {
+ compatible = "nvidia,tegra20-pinmux";
+ reg = < 0x70000000 0xc00 >;
+ };
+
- serial@70006000 {
+ serial at 70006000 {
compatible = "nvidia,tegra20-uart";
reg = <0x70006000 0x40>;
--
diff --git a/a/content_digest b/N2/content_digest
index d26f27d..05f895c 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,10 +2,7 @@
"ref\0001314315824-9687-1-git-send-email-swarren\@nvidia.com\0"
]
[
- "ref\0001314315824-9687-1-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org\0"
-]
-[
- "From\0Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org>\0"
+ "From\0swarren\@nvidia.com (Stephen Warren)\0"
]
[
"Subject\0[PATCH v3 05/13] arm/dt: Tegra: Add pinmux node\0"
@@ -14,20 +11,7 @@
"Date\0Thu, 25 Aug 2011 17:43:36 -0600\0"
]
[
- "To\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ\@public.gmane.org>",
- " Colin Cross <ccross-z5hGa2qSFaRBDgjK7y7TUQ\@public.gmane.org>",
- " Erik Gilling <konkers-z5hGa2qSFaRBDgjK7y7TUQ\@public.gmane.org>",
- " Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w\@public.gmane.org>\0"
-]
-[
- "Cc\0Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ\@public.gmane.org>",
- " Sergei Shtylyov <sshtylyov-Igf4POYTYCDQT0dZR+AlfA\@public.gmane.org>",
- " Belisko Marek <marek.belisko-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
- " devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ\@public.gmane.org",
- " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
- " linux-tegra-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
- " Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -41,7 +25,7 @@
"the entire initial pinmux configuration. This configuration is identical\n",
"to that in board-harmony/seaboard-pinmux.c.\n",
"\n",
- "Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org>\n",
+ "Signed-off-by: Stephen Warren <swarren\@nvidia.com>\n",
"---\n",
" arch/arm/boot/dts/tegra-harmony.dts | 243 ++++++++++++++++++++++++++++++++++\n",
" arch/arm/boot/dts/tegra-seaboard.dts | 239 +++++++++++++++++++++++++++++++++\n",
@@ -56,7 +40,7 @@
" \t\t>;\n",
" \t};\n",
" \n",
- "+\tpinmux: pinmux\@70000000 {\n",
+ "+\tpinmux: pinmux at 70000000 {\n",
"+\t\tnvidia,mux-groups {\n",
"+\t\t\tata {\n",
"+\t\t\t\tpins = \"ata\";\n",
@@ -299,7 +283,7 @@
"+\t\t};\n",
"+\t};\n",
"+\n",
- " \ti2c\@7000c000 {\n",
+ " \ti2c at 7000c000 {\n",
" \t\tclock-frequency = <400000>;\n",
" \n",
"diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts\n",
@@ -310,7 +294,7 @@
" \t\t>;\n",
" \t};\n",
" \n",
- "+\tpinmux: pinmux\@70000000 {\n",
+ "+\tpinmux: pinmux at 70000000 {\n",
"+\t\tnvidia,mux-groups {\n",
"+\t\t\tata {\n",
"+\t\t\t\tpins = \"ata\";\n",
@@ -549,7 +533,7 @@
"+\t\t};\n",
"+\t};\n",
"+\n",
- " \tserial\@70006300 {\n",
+ " \tserial at 70006300 {\n",
" \t\tclock-frequency = < 216000000 >;\n",
" \t};\n",
"diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi\n",
@@ -560,16 +544,16 @@
" \t\tgpio-controller;\n",
" \t};\n",
" \n",
- "+\tpinmux: pinmux\@70000000 {\n",
+ "+\tpinmux: pinmux at 70000000 {\n",
"+\t\tcompatible = \"nvidia,tegra20-pinmux\";\n",
"+\t\treg = < 0x70000000 0xc00 >;\n",
"+\t};\n",
"+\n",
- " \tserial\@70006000 {\n",
+ " \tserial at 70006000 {\n",
" \t\tcompatible = \"nvidia,tegra20-uart\";\n",
" \t\treg = <0x70006000 0x40>;\n",
"-- \n",
"1.7.0.4"
]
-ef49bf83cec5b2d95536261fa9f77964ee4733efd8036172a70744af19977c6e
+510053dd5301028df4afd7c5a5b92dd7e8fc87796d814de9127011832fc78f5a
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.