diff for duplicates of <1326775136-32115-1-git-send-email-rob.lee@linaro.org> diff --git a/a/1.txt b/N1/1.txt index 5c09f5a..81dfee6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ index 7dda599..d62b88d 100644 @@ -508,6 +508,7 @@ }; - ocotp@021bc000 { + ocotp at 021bc000 { + compatible = "fsl,imx6q-ocotp"; reg = <0x021bc000 0x4000>; }; diff --git a/a/content_digest b/N1/content_digest index 51ffc8e..ee29017 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,7 @@ - "From\0Robert Lee <rob.lee@linaro.org>\0" + "From\0rob.lee@linaro.org (Robert Lee)\0" "Subject\0[RFC PATCH v2] ARM: imx: Add basic imx6q thermal management\0" "Date\0Mon, 16 Jan 2012 22:38:56 -0600\0" - "To\0linux@arm.linux.org.uk" - s.hauer@pengutronix.de - " shawn.guo@freescale.com\0" - "Cc\0amit.kachhap@linaro.org" - amit.kucheria@linaro.org - linux-arm-kernel@lists.infradead.org - patches@linaro.org - linux-acpi@vger.kernel.org - " lenb@kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Adds support for temperature sensor readings, registers with common\n" @@ -28,7 +20,7 @@ "@@ -508,6 +508,7 @@\n" " \t\t\t};\n" " \n" - " \t\t\tocotp@021bc000 {\n" + " \t\t\tocotp at 021bc000 {\n" "+\t\t\t\tcompatible = \"fsl,imx6q-ocotp\";\n" " \t\t\t\treg = <0x021bc000 0x4000>;\n" " \t\t\t};\n" @@ -688,4 +680,4 @@ "-- \n" 1.7.1 -8baf56bb24cbdf3bcfdb75b94ae2fb5506c533d1cd1c8a72f2d5d7a25f63b19d +599dc82bb0da1fe494b568135f0324d60a862f0911ce8d43fe198f565b16c706
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.