diff for duplicates of <20130605104456.1720.70240.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 6cbc0f7..cc09e86 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,11 +15,11 @@ Signed-off-by: Magnus Damm <damm@opensource.se> reg = <0 0x40000000 0 0x40000000>; }; -+ memory@200000000 { ++ memory at 200000000 { + device_type = "memory"; + reg = <2 0x00000000 0 0x40000000>; + }; + - ape6evm_fixed_3v3: fixedregulator@0 { + ape6evm_fixed_3v3: fixedregulator at 0 { compatible = "regulator-fixed"; regulator-name = "3V3"; diff --git a/a/content_digest b/N1/content_digest index 0174bc3..e1c44bd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020130605104427.1720.68752.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 03/03] ARM: shmobile: Add second memory bank to DTS for APE6EVM\0" - "Date\0Wed, 05 Jun 2013 10:44:56 +0000\0" + "Date\0Wed, 05 Jun 2013 19:44:56 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -22,13 +22,13 @@ " \t\treg = <0 0x40000000 0 0x40000000>;\n" " \t};\n" " \n" - "+\tmemory@200000000 {\n" + "+\tmemory at 200000000 {\n" "+\t\tdevice_type = \"memory\";\n" "+\t\treg = <2 0x00000000 0 0x40000000>;\n" "+\t};\n" "+\n" - " \tape6evm_fixed_3v3: fixedregulator@0 {\n" + " \tape6evm_fixed_3v3: fixedregulator at 0 {\n" " \t\tcompatible = \"regulator-fixed\";\n" " \t\tregulator-name = \"3V3\";" -2ea6e47e5055ea46e114a426c7820a66a2e9760cc0f28d044414e9e0b79cb476 +b9de57aff278bebdff1f63dffc04053a9e8d8860a3885565e3fbe9317f2a6852
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.