diff for duplicates of <f7dcd382a8d6ce8c6da12786c8311e71e214290d.1398216022.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index e5852e4..13677ce 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -28,28 +28,28 @@ index cdec1af..c3d8b17 100644
+ gpio_keys {
+ compatible = "gpio-keys";
+
-+ button@1 {
++ button at 1 {
+ linux,code = <KEY_1>;
+ label = "SW2-1";
+ gpio-key,wakeup;
+ debounce-interval = <20>;
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+ };
-+ button@2 {
++ button at 2 {
+ linux,code = <KEY_2>;
+ label = "SW2-2";
+ gpio-key,wakeup;
+ debounce-interval = <20>;
+ gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
+ };
-+ button@3 {
++ button at 3 {
+ linux,code = <KEY_3>;
+ label = "SW2-3";
+ gpio-key,wakeup;
+ debounce-interval = <20>;
+ gpios = <&gpio1 26 GPIO_ACTIVE_LOW>;
+ };
-+ button@4 {
++ button at 4 {
+ linux,code = <KEY_4>;
+ label = "SW2-4";
+ gpio-key,wakeup;
diff --git a/a/content_digest b/N1/content_digest
index 7881cc3..8991fbd 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1398216022.git.horms+renesas\@verge.net.au\0"
]
[
- "From\0Simon Horman <horms+renesas\@verge.net.au>\0"
+ "From\0horms+renesas\@verge.net.au (Simon Horman)\0"
]
[
"Subject\0[PATCH 11/33] ARM: shmobile: Add DTS gpio-keys support for SW2 on Lager\0"
]
[
- "Date\0Wed, 23 Apr 2014 01:25:39 +0000\0"
+ "Date\0Wed, 23 Apr 2014 10:25:39 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -50,28 +50,28 @@
"+\tgpio_keys {\n",
"+\t\tcompatible = \"gpio-keys\";\n",
"+\n",
- "+\t\tbutton\@1 {\n",
+ "+\t\tbutton at 1 {\n",
"+\t\t\tlinux,code = <KEY_1>;\n",
"+\t\t\tlabel = \"SW2-1\";\n",
"+\t\t\tgpio-key,wakeup;\n",
"+\t\t\tdebounce-interval = <20>;\n",
"+\t\t\tgpios = <&gpio1 14 GPIO_ACTIVE_LOW>;\n",
"+\t\t};\n",
- "+\t\tbutton\@2 {\n",
+ "+\t\tbutton at 2 {\n",
"+\t\t\tlinux,code = <KEY_2>;\n",
"+\t\t\tlabel = \"SW2-2\";\n",
"+\t\t\tgpio-key,wakeup;\n",
"+\t\t\tdebounce-interval = <20>;\n",
"+\t\t\tgpios = <&gpio1 24 GPIO_ACTIVE_LOW>;\n",
"+\t\t};\n",
- "+\t\tbutton\@3 {\n",
+ "+\t\tbutton at 3 {\n",
"+\t\t\tlinux,code = <KEY_3>;\n",
"+\t\t\tlabel = \"SW2-3\";\n",
"+\t\t\tgpio-key,wakeup;\n",
"+\t\t\tdebounce-interval = <20>;\n",
"+\t\t\tgpios = <&gpio1 26 GPIO_ACTIVE_LOW>;\n",
"+\t\t};\n",
- "+\t\tbutton\@4 {\n",
+ "+\t\tbutton at 4 {\n",
"+\t\t\tlinux,code = <KEY_4>;\n",
"+\t\t\tlabel = \"SW2-4\";\n",
"+\t\t\tgpio-key,wakeup;\n",
@@ -87,4 +87,4 @@
"1.8.5.2"
]
-719e18a0548c1785d0cd9ff7e26b92be2b599250615627085575efd8e3fbbabe
+d5a22659c1d147ee71da465a45f094c96decc578aba26a6568fa7365977abf7e
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.