All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20130821074728.GV7656@atomide.com>

diff --git a/a/1.txt b/N1/1.txt
index bf7ef56..5079426 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -34,14 +34,14 @@ Got this one queued up somewhere?
 >  		};
 >  
 > -		ocp2scp {
-> +		ocp2scp@4a080000 {
+> +		ocp2scp at 4a080000 {
 >  			compatible = "ti,omap-ocp2scp";
 >  			#address-cells = <1>;
 >  			#size-cells = <1>;
 > +			reg = <0x4a080000 0x20>;
 >  			ranges;
 >  			ti,hwmods = "ocp2scp1";
->  			usb2_phy: usb2phy@4a084000 {
+>  			usb2_phy: usb2phy at 4a084000 {
 > diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
 > index 2435109..d9118a1 100644
 > --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
diff --git a/a/content_digest b/N1/content_digest
index 855374d..5a5a779 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,11 +1,8 @@
  "ref\01373642066-5235-1-git-send-email-balbi@ti.com\0"
- "From\0Tony Lindgren <tony@atomide.com>\0"
- "Subject\0Re: [PATCH] arm: omap5: hwmod: add missing ocp2scp hwmod data\0"
+ "From\0tony@atomide.com (Tony Lindgren)\0"
+ "Subject\0[PATCH] arm: omap5: hwmod: add missing ocp2scp hwmod data\0"
  "Date\0Wed, 21 Aug 2013 00:47:29 -0700\0"
- "To\0Benoit Cousson <bcousson@baylibre.com>"
- " Felipe Balbi <balbi@ti.com>\0"
- "Cc\0Linux OMAP Mailing List <linux-omap@vger.kernel.org>"
- " Linux ARM Kernel Mailing List <linux-arm-kernel@lists.infradead.org>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Benoit,\n"
@@ -44,14 +41,14 @@
  ">  \t\t};\n"
  ">  \n"
  "> -\t\tocp2scp {\n"
- "> +\t\tocp2scp@4a080000 {\n"
+ "> +\t\tocp2scp at 4a080000 {\n"
  ">  \t\t\tcompatible = \"ti,omap-ocp2scp\";\n"
  ">  \t\t\t#address-cells = <1>;\n"
  ">  \t\t\t#size-cells = <1>;\n"
  "> +\t\t\treg = <0x4a080000 0x20>;\n"
  ">  \t\t\tranges;\n"
  ">  \t\t\tti,hwmods = \"ocp2scp1\";\n"
- ">  \t\t\tusb2_phy: usb2phy@4a084000 {\n"
+ ">  \t\t\tusb2_phy: usb2phy at 4a084000 {\n"
  "> diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c\n"
  "> index 2435109..d9118a1 100644\n"
  "> --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c\n"
@@ -126,4 +123,4 @@
  "> 1.8.2.1\n"
  >
 
-1fc4ebbfacfd57c85601400f5aa7699f4ac0651c48a08bdb8b47e2b1e2bf562a
+09030eaa0640ca0bcd7b5ca120bccaeee0a723088fe6461ea173301c8e5c0f52

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.