diff for duplicates of <4FDF11D6.6050205@dev.rtsoft.ru> diff --git a/a/1.txt b/N1/1.txt index a53638f..556b004 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,18 +21,18 @@ Index: linux-2.6/arch/arm/boot/dts/omap4.dtsi ti,needs-special-reset; }; + -+ ctrl_module_core: ctrl_module_core@4a002000 { ++ ctrl_module_core: ctrl_module_core at 4a002000 { + compatible = "ti,omap4-control"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + ti,hwmods = "ctrl_module_core"; + reg = <0x4a002000 0x1000>; -+ bandgap@4a002000 { ++ bandgap at 4a002000 { + compatible = "ti,omap4-bandgap"; + reg = <0x4a002000 0x1000>; + }; -+ usb@4a002000 { ++ usb at 4a002000 { + compatible = "ti,omap4-usb-phy"; + reg = <0x4a002000 0x1000>; + }; diff --git a/a/content_digest b/N1/content_digest index ed46d50..7bff8aa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,8 @@ "ref\01337934361-1606-1-git-send-email-eduardo.valentin@ti.com\0" - "From\0Konstantin Baydarov <kbaidarov@dev.rtsoft.ru>\0" + "From\0kbaidarov@dev.rtsoft.ru (Konstantin Baydarov)\0" "Subject\0[RFC PATCH v2 09/11] ARM: DT: Add support to system control module for OMAP4\0" "Date\0Mon, 18 Jun 2012 15:32:38 +0400\0" - "To\0b-cousson@ti.com" - kishon@ti.com - kbaidarov@dev.rtsoft.ru - santosh.shilimkar@ti.com - tony@atomide.com - " paul@pwsan.com\0" - "Cc\0balbi@ti.com" - amit.kucheria@linaro.org - linux-pm@lists.linux-foundation.org - linux-arm-kernel@lists.infradead.org - linux-omap@vger.kernel.org - amit.kachhap@linaro.org - " Eduardo Valentin <eduardo.valentin@ti.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This patch adds device tree entries on OMAP4 based boards\n" @@ -40,18 +28,18 @@ " \t\t\tti,needs-special-reset;\n" " \t\t};\n" "+\n" - "+\t\tctrl_module_core: ctrl_module_core@4a002000 {\n" + "+\t\tctrl_module_core: ctrl_module_core at 4a002000 {\n" "+\t\t\tcompatible = \"ti,omap4-control\";\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges;\n" "+\t\t\tti,hwmods = \"ctrl_module_core\";\n" "+\t\t\treg = <0x4a002000 0x1000>;\n" - "+\t\t\tbandgap@4a002000 {\n" + "+\t\t\tbandgap at 4a002000 {\n" "+\t\t\t\tcompatible = \"ti,omap4-bandgap\";\n" "+\t\t\t\treg = <0x4a002000 0x1000>;\n" "+\t\t\t};\n" - "+\t\t\tusb@4a002000 {\n" + "+\t\t\tusb at 4a002000 {\n" "+\t\t\t\tcompatible = \"ti,omap4-usb-phy\";\n" "+\t\t\t\treg = <0x4a002000 0x1000>;\n" "+\t\t\t};\n" @@ -59,4 +47,4 @@ " \t};\n" }; -e12ae1fc3417dff108799f69dad5b6e9257913db4a6009edc521501f0c764c92 +13d4504953b7312e94de14c5d8c30df49459cb46b41802284452970c5ed350cb
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.