diff for duplicates of <1422442278-10405-11-git-send-email-tomeu.vizoso@collabora.com>
diff --git a/a/content_digest b/N1/content_digest
index 07ed7ee..21d8a49 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,23 +14,23 @@
"To\0linux-kernel\@vger.kernel.org\0"
]
[
- "Cc\0Mark Rutland <mark.rutland\@arm.com>",
- " Alexandre Courbot <gnurou\@gmail.com>",
- " Russell King <linux\@arm.linux.org.uk>",
- " Pawel Moll <pawel.moll\@arm.com>",
- " Tomeu Vizoso <tomeu.vizoso\@collabora.com>",
- " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
+ "Cc\0Javier Martinez Canillas <javier.martinez\@collabora.co.uk>",
+ " Dylan Reid <dgreid\@chromium.org>",
" Andrew Bresticker <abrestic\@chromium.org>",
" Simon Glass <sjg\@chromium.org>",
- " Stephen Warren <swarren\@wwwdotorg.org>",
- " devicetree\@vger.kernel.org",
+ " Tomeu Vizoso <tomeu.vizoso\@collabora.com>",
" Rob Herring <robh+dt\@kernel.org>",
- " Thierry Reding <thierry.reding\@gmail.com>",
+ " Pawel Moll <pawel.moll\@arm.com>",
+ " Mark Rutland <mark.rutland\@arm.com>",
+ " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
" Kumar Gala <galak\@codeaurora.org>",
- " linux-tegra\@vger.kernel.org",
- " Dylan Reid <dgreid\@chromium.org>",
- " Javier Martinez Canillas <javier.martinez\@collabora.co.uk>",
- " linux-arm-kernel\@lists.infradead.org\0"
+ " Russell King <linux\@arm.linux.org.uk>",
+ " Stephen Warren <swarren\@wwwdotorg.org>",
+ " Thierry Reding <thierry.reding\@gmail.com>",
+ " Alexandre Courbot <gnurou\@gmail.com>",
+ " devicetree\@vger.kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " linux-tegra\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -62,4 +62,4 @@
"1.9.3"
]
-1d8e8f726a7675c3afeac9fc60c592ddb141b3faed4326922842dd82c51b2b18
+238dc64c9d0f6d718f09cfa03991ab452c220709d3a0f9b61963704392640ada
diff --git a/a/1.txt b/N2/1.txt
index cd97e0c..1bcefa2 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -11,7 +11,7 @@ index 632d181..6752e95 100644
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -344,6 +344,7 @@
- flash@0 {
+ flash at 0 {
compatible = "winbond,w25q32dw";
+ spi-max-frequency = <25000000>;
reg = <0>;
diff --git a/a/content_digest b/N2/content_digest
index 07ed7ee..73f032b 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001422442278-10405-1-git-send-email-tomeu.vizoso\@collabora.com\0"
]
[
- "From\0Tomeu Vizoso <tomeu.vizoso\@collabora.com>\0"
+ "From\0tomeu.vizoso\@collabora.com (Tomeu Vizoso)\0"
]
[
"Subject\0[PATCH v3 10/10] ARM: tegra: Set spi-max-frequency property to flash node\0"
@@ -11,26 +11,7 @@
"Date\0Wed, 28 Jan 2015 11:51:08 +0100\0"
]
[
- "To\0linux-kernel\@vger.kernel.org\0"
-]
-[
- "Cc\0Mark Rutland <mark.rutland\@arm.com>",
- " Alexandre Courbot <gnurou\@gmail.com>",
- " Russell King <linux\@arm.linux.org.uk>",
- " Pawel Moll <pawel.moll\@arm.com>",
- " Tomeu Vizoso <tomeu.vizoso\@collabora.com>",
- " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
- " Andrew Bresticker <abrestic\@chromium.org>",
- " Simon Glass <sjg\@chromium.org>",
- " Stephen Warren <swarren\@wwwdotorg.org>",
- " devicetree\@vger.kernel.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " Thierry Reding <thierry.reding\@gmail.com>",
- " Kumar Gala <galak\@codeaurora.org>",
- " linux-tegra\@vger.kernel.org",
- " Dylan Reid <dgreid\@chromium.org>",
- " Javier Martinez Canillas <javier.martinez\@collabora.co.uk>",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -52,7 +33,7 @@
"+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi\n",
"\@\@ -344,6 +344,7 \@\@\n",
" \n",
- " \t\tflash\@0 {\n",
+ " \t\tflash at 0 {\n",
" \t\t\tcompatible = \"winbond,w25q32dw\";\n",
"+\t\t\tspi-max-frequency = <25000000>;\n",
" \t\t\treg = <0>;\n",
@@ -62,4 +43,4 @@
"1.9.3"
]
-1d8e8f726a7675c3afeac9fc60c592ddb141b3faed4326922842dd82c51b2b18
+7c8f14fa6f25a624ec061e11d09d0684f4260b5fb6282d5ca5de146ffc3ae645
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.