diff for duplicates of <550BDEEA.9080503@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 38db503..e7152da 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,7 @@ On 19-03-15 20:11, Brian Norris wrote: >>>>>> brcm,int-fwd-mask = <0x70000>; >>>>>> }; >>>>>> + ->>>>>> + sata@f045a000 { +>>>>>> + sata at f045a000 { >>>>>> + compatible = "brcm,bcm7445-ahci", "brcm,sata3-ahci"; >>>>>> + reg-names = "ahci", "top-ctrl"; >>>>>> + reg = <0x45a000 0xa9c>, <0x458040 0x24>; diff --git a/a/content_digest b/N1/content_digest index 3a5808a..fe6c4da 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,23 +5,10 @@ "ref\0550B0118.3040104@redhat.com\0" "ref\020150319173640.GS32500@ld-irv-0074\0" "ref\020150319191105.GU32500@ld-irv-0074\0" - "From\0Hans de Goede <hdegoede@redhat.com>\0" - "Subject\0Re: [PATCH 5/5] ARM: dts: brcmstb: add nodes for SATA controller and PHY\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[PATCH 5/5] ARM: dts: brcmstb: add nodes for SATA controller and PHY\0" "Date\0Fri, 20 Mar 2015 09:48:42 +0100\0" - "To\0Brian Norris <computersforpeace@gmail.com>\0" - "Cc\0Tejun Heo <tj@kernel.org>" - Kishon Vijay Abraham I <kishon@ti.com> - Rob Herring <robh+dt@kernel.org> - Pawel Moll <pawel.moll@arm.com> - Mark Rutland <mark.rutland@arm.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Kumar Gala <galak@codeaurora.org> - Gregory Fong <gregory.0xf0@gmail.com> - Florian Fainelli <f.fainelli@gmail.com> - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " linux-ide@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -53,7 +40,7 @@ ">>>>>> \t\t\tbrcm,int-fwd-mask = <0x70000>;\n" ">>>>>> \t\t};\n" ">>>>>> +\n" - ">>>>>> +\t\tsata@f045a000 {\n" + ">>>>>> +\t\tsata at f045a000 {\n" ">>>>>> +\t\t\tcompatible = \"brcm,bcm7445-ahci\", \"brcm,sata3-ahci\";\n" ">>>>>> +\t\t\treg-names = \"ahci\", \"top-ctrl\";\n" ">>>>>> +\t\t\treg = <0x45a000 0xa9c>, <0x458040 0x24>;\n" @@ -115,4 +102,4 @@ "\n" Hans -b0bd8b2b58f14d82cb5012135b93cba7e46693c5dd6727a88005bff0f795040f +04192454ccbd2eacc755eaaf73a6b02489495aa29f5e5b89a732fc537c969819
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.