diff for duplicates of <30881023.1VWPBCH6CR@avalon> diff --git a/a/1.txt b/N1/1.txt index e4d20b5..ca7a736 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -99,7 +99,8 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > static const struct pinctrl_map koelsch_pinctrl_map[] = { > /* DU */ > PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791", -> @@ -165,6 +219,11 @@ static const struct pinctrl_map koelsch_pinctrl_map[] > { "eth_rmii", "eth"), +> @@ -165,6 +219,11 @@ static const struct pinctrl_map koelsch_pinctrl_map[] = +> { "eth_rmii", "eth"), > PIN_MAP_MUX_GROUP_DEFAULT("r8a7791-ether", "pfc-r8a7791", > "intc_irq0", "intc"), > + /* QSPI */ diff --git a/a/content_digest b/N1/content_digest index 0d08c9b..17a1399 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,14 @@ "ref\01389524433-2823-4-git-send-email-geert@linux-m68k.org\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH V2 3/4] ARM: shmobile: koelsch: Add QSPI support\0" - "Date\0Sun, 12 Jan 2014 21:46:40 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Sun, 12 Jan 2014 22:46:40 +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-spi@vger.kernel.org + " Geert Uytterhoeven <geert+renesas@linux-m68k.org>\0" "\00:1\0" "b\0" "Hi Geert,\n" @@ -107,7 +113,8 @@ "> static const struct pinctrl_map koelsch_pinctrl_map[] = {\n" "> \t/* DU */\n" "> \tPIN_MAP_MUX_GROUP_DEFAULT(\"rcar-du-r8a7791\", \"pfc-r8a7791\",\n" - "> @@ -165,6 +219,11 @@ static const struct pinctrl_map koelsch_pinctrl_map[] > { \"eth_rmii\", \"eth\"),\n" + "> @@ -165,6 +219,11 @@ static const struct pinctrl_map koelsch_pinctrl_map[] =\n" + "> { \"eth_rmii\", \"eth\"),\n" "> \tPIN_MAP_MUX_GROUP_DEFAULT(\"r8a7791-ether\", \"pfc-r8a7791\",\n" "> \t\t\t\t \"intc_irq0\", \"intc\"),\n" "> +\t/* QSPI */\n" @@ -135,4 +142,4 @@ "\n" Laurent Pinchart -04c8ef906e664be41c0e704af62547cb752f3af583bc59502d4468ba5fbf1568 +64e8824dcd2ea2bd7eef9cfaaee3f3f929937b2d6a42a3f57521c9c4206f3860
diff --git a/a/1.txt b/N2/1.txt index e4d20b5..ca7a736 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -99,7 +99,8 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > static const struct pinctrl_map koelsch_pinctrl_map[] = { > /* DU */ > PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791", -> @@ -165,6 +219,11 @@ static const struct pinctrl_map koelsch_pinctrl_map[] > { "eth_rmii", "eth"), +> @@ -165,6 +219,11 @@ static const struct pinctrl_map koelsch_pinctrl_map[] = +> { "eth_rmii", "eth"), > PIN_MAP_MUX_GROUP_DEFAULT("r8a7791-ether", "pfc-r8a7791", > "intc_irq0", "intc"), > + /* QSPI */ diff --git a/a/content_digest b/N2/content_digest index 0d08c9b..85cb0ab 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,8 @@ "ref\01389524433-2823-1-git-send-email-geert@linux-m68k.org\0" "ref\01389524433-2823-4-git-send-email-geert@linux-m68k.org\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH V2 3/4] ARM: shmobile: koelsch: Add QSPI support\0" - "Date\0Sun, 12 Jan 2014 21:46:40 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH V2 3/4] ARM: shmobile: koelsch: Add QSPI support\0" + "Date\0Sun, 12 Jan 2014 22:46:40 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -107,7 +107,8 @@ "> static const struct pinctrl_map koelsch_pinctrl_map[] = {\n" "> \t/* DU */\n" "> \tPIN_MAP_MUX_GROUP_DEFAULT(\"rcar-du-r8a7791\", \"pfc-r8a7791\",\n" - "> @@ -165,6 +219,11 @@ static const struct pinctrl_map koelsch_pinctrl_map[] > { \"eth_rmii\", \"eth\"),\n" + "> @@ -165,6 +219,11 @@ static const struct pinctrl_map koelsch_pinctrl_map[] =\n" + "> { \"eth_rmii\", \"eth\"),\n" "> \tPIN_MAP_MUX_GROUP_DEFAULT(\"r8a7791-ether\", \"pfc-r8a7791\",\n" "> \t\t\t\t \"intc_irq0\", \"intc\"),\n" "> +\t/* QSPI */\n" @@ -135,4 +136,4 @@ "\n" Laurent Pinchart -04c8ef906e664be41c0e704af62547cb752f3af583bc59502d4468ba5fbf1568 +1c96ca5b10f6f3aabdee2f26103f52174c4f82d600a2f50f48e5b04385964315
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.