diff for duplicates of <1364574725.4634.51.camel@mars> diff --git a/a/1.txt b/N1/1.txt index 6b90482..cc86473 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,8 +29,8 @@ index 1acc261..1997b41 100644 + pinctrl-single,function-mask = <0x7f1f>; }; -- 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 0x5c>; @@ -41,6 +41,6 @@ index 1acc261..1997b41 100644 + pinctrl-single,function-mask = <0x7f1f>; }; - gpio1: gpio@48310000 { + gpio1: gpio at 48310000 { -- 1.7.10.4 diff --git a/a/content_digest b/N1/content_digest index a6a715f..3b8e4a5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,16 +2,10 @@ "ref\020130328163854.GV10155@atomide.com\0" "ref\01364549848.4634.13.camel@mars\0" "ref\020130329151759.GB10155@atomide.com\0" - "From\0Christoph Fritz <chf.fritz@googlemail.com>\0" + "From\0chf.fritz@googlemail.com (Christoph Fritz)\0" "Subject\0[PATCH v2] arm/dts: OMAP3: fix pinctrl-single configuration\0" "Date\0Fri, 29 Mar 2013 17:32:05 +0100\0" - "To\0Tony Lindgren <tony@atomide.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" " - Fix 'function-mask' referring to TRM (Omap 36xx) Section 13.4.4:\n" @@ -45,8 +39,8 @@ "+\t\t\tpinctrl-single,function-mask = <0x7f1f>;\n" " \t\t};\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 0x5c>;\n" @@ -57,8 +51,8 @@ "+\t\t\tpinctrl-single,function-mask = <0x7f1f>;\n" " \t\t};\n" " \n" - " \t\tgpio1: gpio@48310000 {\n" + " \t\tgpio1: gpio at 48310000 {\n" "-- \n" 1.7.10.4 -1d52f481c4c5f10fb1547a88254a0c22fcd670d196c286f513692e3364569e38 +348fc34b63379ed2657836c4fb3f4495da37ce13f89b020a5827c2321d274475
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.