diff for duplicates of <3069255.T0Cvttgz9W@avalon> diff --git a/a/1.txt b/N1/1.txt index 6753325..4a268f0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,8 @@ On Sunday 18 August 2013 03:13:26 Sergei Shtylyov wrote: [snip] > Index: net-next/drivers/net/ethernet/renesas/sh_eth.h -> =================================> --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.h +> =================================================================== +> --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.h > +++ net-next/drivers/net/ethernet/renesas/sh_eth.h > @@ -157,6 +157,13 @@ enum { > SH_ETH_MAX_REGISTER_OFFSET, @@ -48,7 +49,8 @@ to be merged through the net tree ? > #if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE) > #define SH4_SKB_RX_ALIGN 32 > Index: net-next/include/linux/sh_eth.h -> =================================> --- net-next.orig/include/linux/sh_eth.h +> =================================================================== +> --- net-next.orig/include/linux/sh_eth.h > +++ net-next/include/linux/sh_eth.h > @@ -5,17 +5,10 @@ > #include <linux/if_ether.h> diff --git a/a/content_digest b/N1/content_digest index 435926d..dbae02d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0201308180313.26607.sergei.shtylyov@cogentembedded.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 2/2] sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'\0" - "Date\0Tue, 20 Aug 2013 10:51:53 +0000\0" + "Date\0Tue, 20 Aug 2013 12:51:53 +0200\0" "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Cc\0netdev@vger.kernel.org" davem@davemloft.net @@ -39,7 +39,8 @@ "[snip]\n" "\n" "> Index: net-next/drivers/net/ethernet/renesas/sh_eth.h\n" - "> =================================> --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.h\n" + "> ===================================================================\n" + "> --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.h\n" "> +++ net-next/drivers/net/ethernet/renesas/sh_eth.h\n" "> @@ -157,6 +157,13 @@ enum {\n" "> \tSH_ETH_MAX_REGISTER_OFFSET,\n" @@ -60,7 +61,8 @@ "> #if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)\n" "> #define SH4_SKB_RX_ALIGN\t32\n" "> Index: net-next/include/linux/sh_eth.h\n" - "> =================================> --- net-next.orig/include/linux/sh_eth.h\n" + "> ===================================================================\n" + "> --- net-next.orig/include/linux/sh_eth.h\n" "> +++ net-next/include/linux/sh_eth.h\n" "> @@ -5,17 +5,10 @@\n" "> #include <linux/if_ether.h>\n" @@ -89,4 +91,4 @@ "\n" Laurent Pinchart -fa1128fe189b149e18886f45b1bc5ee8ab61a15b35558bdf2f830677f257abb5 +16d2650e20722c1f1bb80366e91bea0e6126a6a3253b31d18af449a4ea317242
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.