diff for duplicates of <20130329151759.GB10155@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 2321c3c..e83b77b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ > > > soc { > > > @@ -77,20 +77,20 @@ > > > -> > > omap3_pmx_core: pinmux@48002030 { +> > > omap3_pmx_core: pinmux at 48002030 { > > > compatible = "ti,omap3-padconf", "pinctrl-single"; > > > - reg = <0x48002030 0x05cc>; > > > + reg = <0x48002030 0x234>; @@ -53,8 +53,8 @@ OK > > Ack for the function-mask change for omap3, looks like those bits are not > > used. > > -> > > - omap3_pmx_wkup: pinmux@0x48002a58 { -> > > + omap3_pmx_wkup: pinmux@0x48002a00 { +> > > - omap3_pmx_wkup: pinmux at 0x48002a58 { +> > > + omap3_pmx_wkup: pinmux at 0x48002a00 { > > > compatible = "ti,omap3-padconf", "pinctrl-single"; > > > - reg = <0x48002a58 0x5c>; > > > + reg = <0x48002a00 0x54>; diff --git a/a/content_digest b/N1/content_digest index fdbd09a..9e4b3a0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,10 @@ "ref\01364458106.3757.11.camel@mars\0" "ref\020130328163854.GV10155@atomide.com\0" "ref\01364549848.4634.13.camel@mars\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH] arm/dts: OMAP3: fix pinctrl-single configuration\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH] arm/dts: OMAP3: fix pinctrl-single configuration\0" "Date\0Fri, 29 Mar 2013 08:17:59 -0700\0" - "To\0Christoph Fritz <chf.fritz@googlemail.com>\0" - "Cc\0Beno\303\256t Cousson <b-cousson@ti.com>" - linux-omap@vger.kernel.org - devicetree-discuss@lists.ozlabs.org - linux-arm-kernel@lists.infradead.org - Daniel Mack <daniel@zonque.org> - " Hans J. Koch <hjk@hansjkoch.de>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Christoph Fritz <chf.fritz@googlemail.com> [130329 02:41]:\n" @@ -45,7 +39,7 @@ "> > > \tsoc {\n" "> > > @@ -77,20 +77,20 @@\n" "> > > \n" - "> > > \t\tomap3_pmx_core: pinmux@48002030 {\n" + "> > > \t\tomap3_pmx_core: pinmux at 48002030 {\n" "> > > \t\t\tcompatible = \"ti,omap3-padconf\", \"pinctrl-single\";\n" "> > > -\t\t\treg = <0x48002030 0x05cc>;\n" "> > > +\t\t\treg = <0x48002030 0x234>;\n" @@ -68,8 +62,8 @@ "> > Ack for the function-mask change for omap3, looks like those bits are not\n" "> > used.\n" "> > \n" - "> > > -\t\tomap3_pmx_wkup: pinmux@0x48002a58 {\n" - "> > > +\t\tomap3_pmx_wkup: pinmux@0x48002a00 {\n" + "> > > -\t\tomap3_pmx_wkup: pinmux at 0x48002a58 {\n" + "> > > +\t\tomap3_pmx_wkup: pinmux at 0x48002a00 {\n" "> > > \t\t\tcompatible = \"ti,omap3-padconf\", \"pinctrl-single\";\n" "> > > -\t\t\treg = <0x48002a58 0x5c>;\n" "> > > +\t\t\treg = <0x48002a00 0x54>;\n" @@ -97,4 +91,4 @@ "\n" Tony -06373d7aa6fc535217c966d02a9c6ae4bc7c42f74a80b5a9959ba802415b32b3 +85355f73012bc59f14d91ca705d8325af41e4d1a080ad1a50b740012f9889461
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.