diff for duplicates of <521BC8DA.3010308@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 969b067..70cdbd1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,7 +20,8 @@ On 08/21/2013 04:58 PM, Laurent Pinchart wrote: >>>>>>>>> #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 @@ >>>>>>>>> diff --git a/a/content_digest b/N1/content_digest index 66fdcf1..888b456 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\02054715.7J5PzTuKLW@avalon\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH 2/2] sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'\0" - "Date\0Mon, 26 Aug 2013 21:30:02 +0000\0" + "Date\0Tue, 27 Aug 2013 01:30:02 +0400\0" "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Cc\0netdev@vger.kernel.org" davem@davemloft.net @@ -34,7 +34,8 @@ ">>>>>>>>> #define SH4_SKB_RX_ALIGN 32\n" ">>>>>>>>>\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" ">>>>>>>>>\n" @@ -117,4 +118,4 @@ "\n" WBR, Sergei -22cdaeb928581d7d60cf5d90238d00ccc12aaa09b62419c0c626fbccb079f42c +7a5360182a399648bb5fa9d69bed1cbb31f0ed3b433426b46a0c1ff959d0c37f
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.