diff for duplicates of <8438484.DB7cn7tjVR@avalon> diff --git a/a/1.txt b/N1/1.txt index 9631f7f..645a17a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -52,7 +52,8 @@ On Monday 10 February 2014 11:47:27 Geert Uytterhoeven wrote: > /* - SCIF0 ------------------------------------------------------------- */ > static const unsigned int scif0_data_pins[] = { > /* RX, TX */ -> @@ -3671,6 +3694,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] > { SH_PFC_PIN_GROUP(msiof3_ss2), +> @@ -3671,6 +3694,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] = +> { SH_PFC_PIN_GROUP(msiof3_ss2), > SH_PFC_PIN_GROUP(msiof3_rx), > SH_PFC_PIN_GROUP(msiof3_tx), > + SH_PFC_PIN_GROUP(qspi_ctrl), diff --git a/a/content_digest b/N1/content_digest index df5b3e6..107fa3a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01392029254-15400-1-git-send-email-geert@linux-m68k.org\0" "ref\01392029254-15400-2-git-send-email-geert@linux-m68k.org\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH 1/7] pinctrl: sh-pfc: r8a7790: Add QSPI pin groups\0" - "Date\0Mon, 10 Feb 2014 12:48:36 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH 1/7] pinctrl: sh-pfc: r8a7790: Add QSPI pin groups\0" + "Date\0Mon, 10 Feb 2014 13:48:36 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -60,7 +60,8 @@ "> /* - SCIF0 ------------------------------------------------------------- */\n" "> static const unsigned int scif0_data_pins[] = {\n" "> \t/* RX, TX */\n" - "> @@ -3671,6 +3694,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] > { SH_PFC_PIN_GROUP(msiof3_ss2),\n" + "> @@ -3671,6 +3694,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] =\n" + "> { SH_PFC_PIN_GROUP(msiof3_ss2),\n" "> \tSH_PFC_PIN_GROUP(msiof3_rx),\n" "> \tSH_PFC_PIN_GROUP(msiof3_tx),\n" "> +\tSH_PFC_PIN_GROUP(qspi_ctrl),\n" @@ -103,4 +104,4 @@ "\n" Laurent Pinchart -823b1f47ecde9c35ecd4d1ab8ea191c8699a3d35704b8a8b1b804bd52a5f0689 +e6152e45e7fc3ce59f54adafff0a2f21e03b9ff9e5f416a16b57bb7cf0cb0a28
diff --git a/a/1.txt b/N2/1.txt index 9631f7f..645a17a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -52,7 +52,8 @@ On Monday 10 February 2014 11:47:27 Geert Uytterhoeven wrote: > /* - SCIF0 ------------------------------------------------------------- */ > static const unsigned int scif0_data_pins[] = { > /* RX, TX */ -> @@ -3671,6 +3694,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] > { SH_PFC_PIN_GROUP(msiof3_ss2), +> @@ -3671,6 +3694,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] = +> { SH_PFC_PIN_GROUP(msiof3_ss2), > SH_PFC_PIN_GROUP(msiof3_rx), > SH_PFC_PIN_GROUP(msiof3_tx), > + SH_PFC_PIN_GROUP(qspi_ctrl), diff --git a/a/content_digest b/N2/content_digest index df5b3e6..7e9c3d4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,15 @@ "ref\01392029254-15400-2-git-send-email-geert@linux-m68k.org\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 1/7] pinctrl: sh-pfc: r8a7790: Add QSPI pin groups\0" - "Date\0Mon, 10 Feb 2014 12:48:36 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Mon, 10 Feb 2014 13:48:36 +0100\0" + "To\0Geert Uytterhoeven <geert@linux-m68k.org>\0" + "Cc\0Simon Horman <horms@verge.net.au>" + Magnus Damm <magnus.damm@gmail.com> + linux-sh@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + Geert Uytterhoeven <geert+renesas@linux-m68k.org> + " Linus Walleij <linus.walleij@linaro.org>\0" "\00:1\0" "b\0" "Hi Geert,\n" @@ -60,7 +67,8 @@ "> /* - SCIF0 ------------------------------------------------------------- */\n" "> static const unsigned int scif0_data_pins[] = {\n" "> \t/* RX, TX */\n" - "> @@ -3671,6 +3694,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] > { SH_PFC_PIN_GROUP(msiof3_ss2),\n" + "> @@ -3671,6 +3694,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] =\n" + "> { SH_PFC_PIN_GROUP(msiof3_ss2),\n" "> \tSH_PFC_PIN_GROUP(msiof3_rx),\n" "> \tSH_PFC_PIN_GROUP(msiof3_tx),\n" "> +\tSH_PFC_PIN_GROUP(qspi_ctrl),\n" @@ -103,4 +111,4 @@ "\n" Laurent Pinchart -823b1f47ecde9c35ecd4d1ab8ea191c8699a3d35704b8a8b1b804bd52a5f0689 +3ca0d06afb86a4fe79671ab7246e183c1a18ee6dc436fb63a02e6b9e01ad8a88
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.