diff for duplicates of <1830191.ln1GpHdqLv@phil> diff --git a/a/1.txt b/N1/1.txt index 855aea4..aa0bc38 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,12 +16,12 @@ index 0fcbcfd..0a3d5b1 100644 compatible = "simple-bus"; ranges; -+ scu at 1013c000 { ++ scu@1013c000 { + compatible = "arm,cortex-a9-scu"; + reg = <0x1013c000 0x100>; + }; + - gic: interrupt-controller at 1013d000 { + gic: interrupt-controller@1013d000 { compatible = "arm,cortex-a9-gic"; interrupt-controller; diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig diff --git a/a/content_digest b/N1/content_digest index 53e5243..3ac12cc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,19 @@ "ref\021117503.1c6iOkvYSr@phil\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" + "From\0Heiko St\303\274bner <heiko@sntech.de>\0" "Subject\0[PATCH v8 3/6] ARM: rockchip: add snoop-control-unit\0" "Date\0Tue, 25 Feb 2014 12:47:06 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "Cc\0arm@kernel.org" + Grant Likely <grant.likely@linaro.org> + Rob Herring <robherring2@gmail.com> + devicetree@vger.kernel.org + Philipp Zabel <p.zabel@pengutronix.de> + linux-kernel@vger.kernel.org + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Stephen Warren <swarren@wwwdotorg.org> + " Ian Campbell <ijc+devicetree@hellion.org.uk>\0" "\00:1\0" "b\0" "This adds the device-node and config select to enable the\n" @@ -23,12 +34,12 @@ " \t\tcompatible = \"simple-bus\";\n" " \t\tranges;\n" " \n" - "+\t\tscu at 1013c000 {\n" + "+\t\tscu@1013c000 {\n" "+\t\t\tcompatible = \"arm,cortex-a9-scu\";\n" "+\t\t\treg = <0x1013c000 0x100>;\n" "+\t\t};\n" "+\n" - " \t\tgic: interrupt-controller at 1013d000 {\n" + " \t\tgic: interrupt-controller@1013d000 {\n" " \t\t\tcompatible = \"arm,cortex-a9-gic\";\n" " \t\t\tinterrupt-controller;\n" "diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig\n" @@ -46,4 +57,4 @@ "-- \n" 1.8.5.3 -8b61dee489b03b0090ba9f8aaae1f8f9169cb9868f8158dda2d928c8233a3b39 +f6ddadcecc305f7720737226acd5053d56946ea5c1b0e3299e1e1e66ef65311c
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.