diff for duplicates of <56307B33.90608@samsung.com> diff --git a/a/1.txt b/N1/1.txt index ba794b6..4105c69 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -69,25 +69,25 @@ index 2f31f773b096..ffda7f5118cd 100644 +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -78,7 +78,7 @@ - sromc@12570000 { + sromc at 12570000 { compatible = "samsung,exynos-srom"; - reg = <0x12570000 0x10>; + reg = <0x12570000 0x14>; }; - mipi_phy: video-phy@10020710 { + mipi_phy: video-phy at 10020710 { diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index b5d3437922c5..fb52d16fba33 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -32,7 +32,7 @@ - sromc@12250000 { + sromc at 12250000 { compatible = "samsung,exynos-srom"; - reg = <0x12250000 0x10>; + reg = <0x12250000 0x14>; }; - combiner: interrupt-controller@10440000 { + combiner: interrupt-controller at 10440000 { -- 1.9.1 diff --git a/a/content_digest b/N1/content_digest index 97a8cd6..20d05f2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,9 @@ "ref\0562AA40E.4050407@kernel.org\0" "ref\0562AA603.7040600@kernel.org\0" - "From\0Krzysztof Kozlowski <k.kozlowski@samsung.com>\0" - "Subject\0Re: [GIT PULL 4/5] Late Samsung driver updates for v4.4\0" + "From\0k.kozlowski@samsung.com (Krzysztof Kozlowski)\0" + "Subject\0[GIT PULL 4/5] Late Samsung driver updates for v4.4\0" "Date\0Wed, 28 Oct 2015 16:37:23 +0900\0" - "To\0Kukjin Kim <kgene@kernel.org>" - arm@kernel.org - Arnd Bergmann <arnd@arndb.de> - 'Olof Johansson' <olof@lixom.net> - " Kevin Hilman <khilman@linaro.org>\0" - "Cc\0linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>" - linux-samsung-soc@vger.kernel.org <linux-samsung-soc@vger.kernel.org> - " p.fedin@samsung.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 24.10.2015 06:26, Kukjin Kim wrote:\n" @@ -84,27 +77,27 @@ "+++ b/arch/arm/boot/dts/exynos4.dtsi\n" "@@ -78,7 +78,7 @@\n" "\n" - " \tsromc@12570000 {\n" + " \tsromc at 12570000 {\n" " \t\tcompatible = \"samsung,exynos-srom\";\n" "-\t\treg = <0x12570000 0x10>;\n" "+\t\treg = <0x12570000 0x14>;\n" " \t};\n" "\n" - " \tmipi_phy: video-phy@10020710 {\n" + " \tmipi_phy: video-phy at 10020710 {\n" "diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi\n" "index b5d3437922c5..fb52d16fba33 100644\n" "--- a/arch/arm/boot/dts/exynos5.dtsi\n" "+++ b/arch/arm/boot/dts/exynos5.dtsi\n" "@@ -32,7 +32,7 @@\n" "\n" - " \tsromc@12250000 {\n" + " \tsromc at 12250000 {\n" " \t\tcompatible = \"samsung,exynos-srom\";\n" "-\t\treg = <0x12250000 0x10>;\n" "+\t\treg = <0x12250000 0x14>;\n" " \t};\n" "\n" - " \tcombiner: interrupt-controller@10440000 {\n" + " \tcombiner: interrupt-controller at 10440000 {\n" "-- \n" 1.9.1 -01ae28d2ea169f147ccae6d58eb3a2cb38e51deec456542ec2ab12438ac1bf8e +9d5ba3415dc4a76c3e81540ea05c9ee19f83eb57389eea5f81877d9bd9513882
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.