diff for duplicates of <20131120000553.27024.20445.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 9575a7f..e8b7067 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> @@ -223,7 +223,7 @@ }; - mmcif0: mmcif@ee200000 { + mmcif0: mmcif at ee200000 { - compatible = "renesas,sh-mmcif"; + compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif"; reg = <0 0xee200000 0 0x80>; @@ -24,7 +24,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> @@ -232,7 +232,7 @@ }; - mmcif1: mmc@ee220000 { + mmcif1: mmc at ee220000 { - compatible = "renesas,sh-mmcif"; + compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif"; reg = <0 0xee220000 0 0x80>; diff --git a/a/content_digest b/N1/content_digest index 9f2ea26..02b78df 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH] ARM: shmobile: Use r8a7790 suffix for MMCIF compat string\0" - "Date\0Wed, 20 Nov 2013 00:05:53 +0000\0" + "Date\0Wed, 20 Nov 2013 09:05:53 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -21,7 +21,7 @@ "@@ -223,7 +223,7 @@\n" " \t};\n" " \n" - " \tmmcif0: mmcif@ee200000 {\n" + " \tmmcif0: mmcif at ee200000 {\n" "-\t\tcompatible = \"renesas,sh-mmcif\";\n" "+\t\tcompatible = \"renesas,mmcif-r8a7790\", \"renesas,sh-mmcif\";\n" " \t\treg = <0 0xee200000 0 0x80>;\n" @@ -30,11 +30,11 @@ "@@ -232,7 +232,7 @@\n" " \t};\n" " \n" - " \tmmcif1: mmc@ee220000 {\n" + " \tmmcif1: mmc at ee220000 {\n" "-\t\tcompatible = \"renesas,sh-mmcif\";\n" "+\t\tcompatible = \"renesas,mmcif-r8a7790\", \"renesas,sh-mmcif\";\n" " \t\treg = <0 0xee220000 0 0x80>;\n" " \t\tinterrupt-parent = <&gic>;\n" " \t\tinterrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>;" -5083f3baf7116533af47565367689b33e42b72f1c8af65b47b19d934084c9fb1 +ff6d7df9d45c21fca8363a733194d6c1b541ff0bc9f1fd74d3d082699cbb828b
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.