diff for duplicates of <20140528135154.GQ11907@google.com> diff --git a/a/1.txt b/N1/1.txt index 53a208e..bc64c9d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,8 +39,7 @@ Applied to pci/host-rcar for v3.16, thanks everybody! > 2 files changed, 95 insertions(+), 2 deletions(-) > > Index: pci/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt -> =================================================================== -> --- /dev/null +> =================================> --- /dev/null > +++ pci/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt > @@ -0,0 +1,66 @@ > +Renesas AHB to PCI bridge @@ -110,8 +109,7 @@ Applied to pci/host-rcar for v3.16, thanks everybody! > + pinctrl-names = "default"; > +}; > Index: pci/drivers/pci/host/pci-rcar-gen2.c -> =================================================================== -> --- pci.orig/drivers/pci/host/pci-rcar-gen2.c +> =================================> --- pci.orig/drivers/pci/host/pci-rcar-gen2.c > +++ pci/drivers/pci/host/pci-rcar-gen2.c > @@ -98,6 +98,7 @@ struct rcar_pci_priv { > struct resource io_res; diff --git a/a/content_digest b/N1/content_digest index 22b41ed..c0cd55d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201405200110.21914.sergei.shtylyov@cogentembedded.com\0" "From\0Bjorn Helgaas <bhelgaas@google.com>\0" "Subject\0Re: [PATCH v4] pci-rcar-gen2: add device tree support\0" - "Date\0Wed, 28 May 2014 07:51:54 -0600\0" + "Date\0Wed, 28 May 2014 13:51:54 +0000\0" "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Cc\0robh+dt@kernel.org" pawel.moll@arm.com @@ -58,8 +58,7 @@ "> 2 files changed, 95 insertions(+), 2 deletions(-)\n" "> \n" "> Index: pci/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt\n" - "> ===================================================================\n" - "> --- /dev/null\n" + "> =================================> --- /dev/null\n" "> +++ pci/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt\n" "> @@ -0,0 +1,66 @@\n" "> +Renesas AHB to PCI bridge\n" @@ -129,8 +128,7 @@ "> +\tpinctrl-names = \"default\";\n" "> +};\n" "> Index: pci/drivers/pci/host/pci-rcar-gen2.c\n" - "> ===================================================================\n" - "> --- pci.orig/drivers/pci/host/pci-rcar-gen2.c\n" + "> =================================> --- pci.orig/drivers/pci/host/pci-rcar-gen2.c\n" "> +++ pci/drivers/pci/host/pci-rcar-gen2.c\n" "> @@ -98,6 +98,7 @@ struct rcar_pci_priv {\n" "> \tstruct resource io_res;\n" @@ -197,4 +195,4 @@ "> \t.probe = rcar_pci_probe,\n" > }; -f652f5c0fd48af6b05952e3816104e05f94dc7c0f054e87060fa1bc5aca2867b +382001084ecde3068cd7265c1fe21413f0e490fa05937e0e5448bf492835822a
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.