diff for duplicates of <20131003054221.8941.87801.stgit@localhost> diff --git a/a/1.txt b/N1/1.txt index 46a30a5..60af9df 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,9 +38,9 @@ Cc: Prakash Manjunathappa <prakash.pm@ti.com> Cc: Roger Quadros <rogerq@ti.com> Cc: Haojian Zhuang <haojian.zhuang@linaro.org> Cc: Linus Walleij <linus.walleij@linaro.org> -Cc: linux-kernel@vger.kernel.org -Cc: Benoît Cousson <bcousson@baylibre.com> -Cc: devicetree@vger.kernel.org +Cc: linux-kernel at vger.kernel.org +Cc: Beno?t Cousson <bcousson@baylibre.com> +Cc: devicetree at vger.kernel.org Signed-off-by: Tony Lindgren <tony@atomide.com> --- .../devicetree/bindings/pinctrl/pinctrl-single.txt | 11 + @@ -65,7 +65,7 @@ index 5a02e30..7069a0b 100644 This driver assumes that there is only one register for each pin (unless the pinctrl-single,bit-per-mux is set), and uses the common pinctrl bindings as specified in the pinctrl-bindings.txt document in this directory. -@@ -121,6 +128,8 @@ pmx_core: pinmux@4a100040 { +@@ -121,6 +128,8 @@ pmx_core: pinmux at 4a100040 { reg = <0x4a100040 0x0196>; #address-cells = <1>; #size-cells = <0>; @@ -74,7 +74,7 @@ index 5a02e30..7069a0b 100644 pinctrl-single,register-width = <16>; pinctrl-single,function-mask = <0xffff>; }; -@@ -131,6 +140,8 @@ pmx_wkup: pinmux@4a31e040 { +@@ -131,6 +140,8 @@ pmx_wkup: pinmux at 4a31e040 { reg = <0x4a31e040 0x0038>; #address-cells = <1>; #size-cells = <0>; @@ -553,8 +553,3 @@ index f88d3d1..b4ff055 100644 { .compatible = "pinctrl-single", .data = &pinctrl_single }, { .compatible = "pinconf-single", .data = &pinconf_single }, { }, - --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index fbe58ab..a163258 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,8 @@ "ref\020131003054104.8941.88857.stgit@localhost\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 4/6] pinctrl: single: Add support for wake-up interrupts\0" "Date\0Wed, 02 Oct 2013 22:42:21 -0700\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0devicetree@vger.kernel.org" - Grygorii Strashko <grygorii.strashko@ti.com> - Linus Walleij <linus.walleij@linaro.org> - linux-kernel@vger.kernel.org - Peter Ujfalusi <peter.ujfalusi@ti.com> - Prakash Manjunathappa <prakash.pm@ti.com> - Haojian Zhuang <haojian.zhuang@linaro.org> - " Beno\303\256t Cousson <bcousson@baylibre.com>" - linux-omap@vger.kernel.org - " Roger Quadros <rogerq@ti.com>\0" "\00:1\0" "b\0" "The pin control registers can have interrupts for example\n" @@ -55,9 +45,9 @@ "Cc: Roger Quadros <rogerq@ti.com>\n" "Cc: Haojian Zhuang <haojian.zhuang@linaro.org>\n" "Cc: Linus Walleij <linus.walleij@linaro.org>\n" - "Cc: linux-kernel@vger.kernel.org\n" - "Cc: Beno\303\256t Cousson <bcousson@baylibre.com>\n" - "Cc: devicetree@vger.kernel.org\n" + "Cc: linux-kernel at vger.kernel.org\n" + "Cc: Beno?t Cousson <bcousson@baylibre.com>\n" + "Cc: devicetree at vger.kernel.org\n" "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" "---\n" " .../devicetree/bindings/pinctrl/pinctrl-single.txt | 11 +\n" @@ -82,7 +72,7 @@ " This driver assumes that there is only one register for each pin (unless the\n" " pinctrl-single,bit-per-mux is set), and uses the common pinctrl bindings as\n" " specified in the pinctrl-bindings.txt document in this directory.\n" - "@@ -121,6 +128,8 @@ pmx_core: pinmux@4a100040 {\n" + "@@ -121,6 +128,8 @@ pmx_core: pinmux at 4a100040 {\n" " \treg = <0x4a100040 0x0196>;\n" " \t#address-cells = <1>;\n" " \t#size-cells = <0>;\n" @@ -91,7 +81,7 @@ " \tpinctrl-single,register-width = <16>;\n" " \tpinctrl-single,function-mask = <0xffff>;\n" " };\n" - "@@ -131,6 +140,8 @@ pmx_wkup: pinmux@4a31e040 {\n" + "@@ -131,6 +140,8 @@ pmx_wkup: pinmux at 4a31e040 {\n" " \treg = <0x4a31e040 0x0038>;\n" " \t#address-cells = <1>;\n" " \t#size-cells = <0>;\n" @@ -569,11 +559,6 @@ "+\t{ .compatible = \"ti,omap5-padconf\", .data = &pinctrl_single_omap_wkup },\n" " \t{ .compatible = \"pinctrl-single\", .data = &pinctrl_single },\n" " \t{ .compatible = \"pinconf-single\", .data = &pinconf_single },\n" - " \t{ },\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + " \t{ }," -e6271f25c62ae8ee4a1a5866e8211f975ee594d9e6455f91b260641e8ef45092 +0de14a03e9a9ca46ec78f37d22ee3a16a76ac2612bc77ad8d6fa0eca1fcccb1e
diff --git a/a/1.txt b/N2/1.txt index 46a30a5..d93bd58 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -553,8 +553,3 @@ index f88d3d1..b4ff055 100644 { .compatible = "pinctrl-single", .data = &pinctrl_single }, { .compatible = "pinconf-single", .data = &pinconf_single }, { }, - --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index fbe58ab..0f1de55 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -569,11 +569,6 @@ "+\t{ .compatible = \"ti,omap5-padconf\", .data = &pinctrl_single_omap_wkup },\n" " \t{ .compatible = \"pinctrl-single\", .data = &pinctrl_single },\n" " \t{ .compatible = \"pinconf-single\", .data = &pinconf_single },\n" - " \t{ },\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + " \t{ }," -e6271f25c62ae8ee4a1a5866e8211f975ee594d9e6455f91b260641e8ef45092 +cd168edc778732415d99d0c5af3ffd6433d9fc1f3063a7d9982bb27dbc35aab8
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.