diff for duplicates of <201403290253.14497.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index ee27ff1..1893eac 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -100,7 +100,7 @@ index b2adb1f..cb48448 100644 + and "sclk_sata" for the internal controller clock. Example: - sata@122f0000 { + sata at 122f0000 { diff --git a/Documentation/devicetree/bindings/phy/samsung-phy.txt b/Documentation/devicetree/bindings/phy/samsung-phy.txt index a937f75..67d38b3 100644 --- a/Documentation/devicetree/bindings/phy/samsung-phy.txt @@ -117,4 +117,4 @@ index a937f75..67d38b3 100644 +- samsung,syscon-phandle : a phandle to the PMU system controller, no arguments Example: - sata_phy: sata-phy@12170000 { + sata_phy: sata-phy at 12170000 { diff --git a/a/content_digest b/N1/content_digest index e25d0cf..1dd0f83 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,8 @@ "ref\05328549D.1090008@samsung.com\0" - "From\0Arnd Bergmann <arnd@arndb.de>\0" - "Subject\0Re: [GIT PULL 2/2] Samsung 2nd DT updates for v3.15\0" + "From\0arnd@arndb.de (Arnd Bergmann)\0" + "Subject\0[GIT PULL 2/2] Samsung 2nd DT updates for v3.15\0" "Date\0Sat, 29 Mar 2014 02:53:14 +0100\0" - "To\0Kukjin Kim <kgene.kim@samsung.com>\0" - "Cc\0'Olof Johansson' <olof@lixom.net>" - Kevin Hilman <khilman@linaro.org> - arm@kernel.org - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - linux-samsung-soc@vger.kernel.org <linux-samsung-soc@vger.kernel.org> - Device Tree <devicetree@vger.kernel.org> - Yuvaraj Kumar C D <yuvaraj.cd@samsung.com> - " Kishon Vijay Abraham I <kishon@ti.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tuesday 18 March 2014, Kukjin Kim wrote:\n" @@ -115,7 +107,7 @@ "+\t\t\t and \"sclk_sata\" for the internal controller clock.\n" " \n" " Example:\n" - " \tsata@122f0000 {\n" + " \tsata at 122f0000 {\n" "diff --git a/Documentation/devicetree/bindings/phy/samsung-phy.txt b/Documentation/devicetree/bindings/phy/samsung-phy.txt\n" "index a937f75..67d38b3 100644\n" "--- a/Documentation/devicetree/bindings/phy/samsung-phy.txt\n" @@ -132,6 +124,6 @@ "+- samsung,syscon-phandle : a phandle to the PMU system controller, no arguments\n" " \n" " Example:\n" - " \tsata_phy: sata-phy@12170000 {" + " \tsata_phy: sata-phy at 12170000 {" -eec0959531909897dd28a5dded77267163d1e06ca00fffb726f4ed7deb2a3914 +bef388b5b8366ba44f70aa71d71b6a36a184ab063f26d2663d421b7293615838
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.