diff for duplicates of <20170401071854.23198-8-javier@osg.samsung.com>
diff --git a/a/1.txt b/N1/1.txt
index 02aa87c..6e28eca 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,8 +17,8 @@ index 5882a2606ac3..3f14b4df69b4 100644
+++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi
@@ -30,7 +30,7 @@
- i2c@80004000 {
- tps61052@33 {
+ i2c at 80004000 {
+ tps61052 at 33 {
- compatible = "tps61052";
+ compatible = "ti,tps61052";
reg = <0x33>;
diff --git a/a/content_digest b/N1/content_digest
index 0335f2b..87be59c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\00020170401071854.23198-1-javier\@osg.samsung.com\0"
]
[
- "From\0Javier Martinez Canillas <javier\@osg.samsung.com>\0"
+ "From\0javier\@osg.samsung.com (Javier Martinez Canillas)\0"
]
[
"Subject\0[PATCH v3 7/7] ARM: ux500: Add vendor prefix to tps61052 node\0"
@@ -11,16 +11,7 @@
"Date\0Sat, 1 Apr 2017 03:18:54 -0400\0"
]
[
- "To\0linux-kernel\@vger.kernel.org\0"
-]
-[
- "Cc\0devicetree\@vger.kernel.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " Lee Jones <lee.jones\@linaro.org>",
- " Javier Martinez Canillas <javier\@osg.samsung.com>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Russell King <linux\@armlinux.org.uk>",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -48,8 +39,8 @@
"+++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi\n",
"\@\@ -30,7 +30,7 \@\@\n",
" \n",
- " \t\ti2c\@80004000 {\n",
- " \t\t\ttps61052\@33 {\n",
+ " \t\ti2c at 80004000 {\n",
+ " \t\t\ttps61052 at 33 {\n",
"-\t\t\t\tcompatible = \"tps61052\";\n",
"+\t\t\t\tcompatible = \"ti,tps61052\";\n",
" \t\t\t\treg = <0x33>;\n",
@@ -59,4 +50,4 @@
"2.9.3"
]
-7e18aeda7214cbbef0e7ee4d12b9388c0ab6ab599b69741fe15d2eec3f1be359
+f9f669cffbc0b8717cde315cf9c951048f590f387e2cb7df1b93581258dcdf31
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.