diff for duplicates of <1410176286-32533-3-git-send-email-linus.walleij@linaro.org>
diff --git a/a/1.txt b/N1/1.txt
index c038a11..87911ee 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,6 +1,6 @@
This adds the device tree bindings used by register bit LEDs.
-Cc: devicetree@vger.kernel.org
+Cc: devicetree at vger.kernel.org
Cc: Bryan Wu <cooloney@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
@@ -57,11 +57,11 @@ index 000000000000..379cefdc0bda
+
+Example:
+
-+syscon: syscon@10000000 {
++syscon: syscon at 10000000 {
+ compatible = "arm,realview-pb1176-syscon", "syscon";
+ reg = <0x10000000 0x1000>;
+
-+ led@08.0 {
++ led at 08.0 {
+ compatible = "register-bit-led";
+ offset = <0x08>;
+ mask = <0x01>;
@@ -69,7 +69,7 @@ index 000000000000..379cefdc0bda
+ linux,default-trigger = "heartbeat";
+ default-state = "on";
+ };
-+ led@08.1 {
++ led at 08.1 {
+ compatible = "register-bit-led";
+ offset = <0x08>;
+ mask = <0x02>;
@@ -77,7 +77,7 @@ index 000000000000..379cefdc0bda
+ linux,default-trigger = "mmc0";
+ default-state = "off";
+ };
-+ led@08.2 {
++ led at 08.2 {
+ compatible = "register-bit-led";
+ offset = <0x08>;
+ mask = <0x04>;
@@ -85,35 +85,35 @@ index 000000000000..379cefdc0bda
+ linux,default-trigger = "cpu0";
+ default-state = "off";
+ };
-+ led@08.3 {
++ led at 08.3 {
+ compatible = "register-bit-led";
+ offset = <0x08>;
+ mask = <0x08>;
+ label = "versatile:3";
+ default-state = "off";
+ };
-+ led@08.4 {
++ led at 08.4 {
+ compatible = "register-bit-led";
+ offset = <0x08>;
+ mask = <0x10>;
+ label = "versatile:4";
+ default-state = "off";
+ };
-+ led@08.5 {
++ led at 08.5 {
+ compatible = "register-bit-led";
+ offset = <0x08>;
+ mask = <0x20>;
+ label = "versatile:5";
+ default-state = "off";
+ };
-+ led@08.6 {
++ led at 08.6 {
+ compatible = "register-bit-led";
+ offset = <0x08>;
+ mask = <0x40>;
+ label = "versatile:6";
+ default-state = "off";
+ };
-+ led@08.7 {
++ led at 08.7 {
+ compatible = "register-bit-led";
+ offset = <0x08>;
+ mask = <0x80>;
diff --git a/a/content_digest b/N1/content_digest
index f7aba38..93da00a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001410176286-32533-1-git-send-email-linus.walleij\@linaro.org\0"
]
[
- "From\0Linus Walleij <linus.walleij\@linaro.org>\0"
+ "From\0linus.walleij\@linaro.org (Linus Walleij)\0"
]
[
"Subject\0[PATCH 2/7 v6] leds: add device tree bindings for register bit LEDs\0"
@@ -11,21 +11,7 @@
"Date\0Mon, 8 Sep 2014 13:38:01 +0200\0"
]
[
- "To\0linux-arm-kernel\@lists.infradead.org",
- " devicetree\@vger.kernel.org",
- " linux-leds\@vger.kernel.org",
- " linux-pm\@vger.kernel.org\0"
-]
-[
- "Cc\0Arnd Bergmann <arnd\@arndb.de>",
- " Pawel Moll <pawel.moll\@arm.com>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Marc Zyngier <marc.zyngier\@arm.com>",
- " Will Deacon <will.deacon\@arm.com>",
- " Rob Herring <robh\@kernel.org>",
- " Linus Walleij <linus.walleij\@linaro.org>",
- " Bryan Wu <cooloney\@gmail.com>",
- " Richard Purdie <rpurdie\@rpsys.net>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -36,7 +22,7 @@
[
"This adds the device tree bindings used by register bit LEDs.\n",
"\n",
- "Cc: devicetree\@vger.kernel.org\n",
+ "Cc: devicetree at vger.kernel.org\n",
"Cc: Bryan Wu <cooloney\@gmail.com>\n",
"Cc: Richard Purdie <rpurdie\@rpsys.net>\n",
"Signed-off-by: Linus Walleij <linus.walleij\@linaro.org>\n",
@@ -93,11 +79,11 @@
"+\n",
"+Example:\n",
"+\n",
- "+syscon: syscon\@10000000 {\n",
+ "+syscon: syscon at 10000000 {\n",
"+\tcompatible = \"arm,realview-pb1176-syscon\", \"syscon\";\n",
"+\treg = <0x10000000 0x1000>;\n",
"+\n",
- "+\tled\@08.0 {\n",
+ "+\tled at 08.0 {\n",
"+\t\tcompatible = \"register-bit-led\";\n",
"+\t\toffset = <0x08>;\n",
"+\t\tmask = <0x01>;\n",
@@ -105,7 +91,7 @@
"+\t\tlinux,default-trigger = \"heartbeat\";\n",
"+\t\tdefault-state = \"on\";\n",
"+\t};\n",
- "+\tled\@08.1 {\n",
+ "+\tled at 08.1 {\n",
"+\t\tcompatible = \"register-bit-led\";\n",
"+\t\toffset = <0x08>;\n",
"+\t\tmask = <0x02>;\n",
@@ -113,7 +99,7 @@
"+\t\tlinux,default-trigger = \"mmc0\";\n",
"+\t\tdefault-state = \"off\";\n",
"+\t};\n",
- "+\tled\@08.2 {\n",
+ "+\tled at 08.2 {\n",
"+\t\tcompatible = \"register-bit-led\";\n",
"+\t\toffset = <0x08>;\n",
"+\t\tmask = <0x04>;\n",
@@ -121,35 +107,35 @@
"+\t\tlinux,default-trigger = \"cpu0\";\n",
"+\t\tdefault-state = \"off\";\n",
"+\t};\n",
- "+\tled\@08.3 {\n",
+ "+\tled at 08.3 {\n",
"+\t\tcompatible = \"register-bit-led\";\n",
"+\t\toffset = <0x08>;\n",
"+\t\tmask = <0x08>;\n",
"+\t\tlabel = \"versatile:3\";\n",
"+\t\tdefault-state = \"off\";\n",
"+\t};\n",
- "+\tled\@08.4 {\n",
+ "+\tled at 08.4 {\n",
"+\t\tcompatible = \"register-bit-led\";\n",
"+\t\toffset = <0x08>;\n",
"+\t\tmask = <0x10>;\n",
"+\t\tlabel = \"versatile:4\";\n",
"+\t\tdefault-state = \"off\";\n",
"+\t};\n",
- "+\tled\@08.5 {\n",
+ "+\tled at 08.5 {\n",
"+\t\tcompatible = \"register-bit-led\";\n",
"+\t\toffset = <0x08>;\n",
"+\t\tmask = <0x20>;\n",
"+\t\tlabel = \"versatile:5\";\n",
"+\t\tdefault-state = \"off\";\n",
"+\t};\n",
- "+\tled\@08.6 {\n",
+ "+\tled at 08.6 {\n",
"+\t\tcompatible = \"register-bit-led\";\n",
"+\t\toffset = <0x08>;\n",
"+\t\tmask = <0x40>;\n",
"+\t\tlabel = \"versatile:6\";\n",
"+\t\tdefault-state = \"off\";\n",
"+\t};\n",
- "+\tled\@08.7 {\n",
+ "+\tled at 08.7 {\n",
"+\t\tcompatible = \"register-bit-led\";\n",
"+\t\toffset = <0x08>;\n",
"+\t\tmask = <0x80>;\n",
@@ -161,4 +147,4 @@
"1.9.3"
]
-5cd52320dc77b426055b62ac6d5e3ec395d5667d642df398f21f14e81a8a31fe
+3bf21eb9369fc39638e8003b06f03bd670ba4907d184973d9b5eb7093332c971
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.