diff for duplicates of <9844233.YJQHWPv5fc@avalon> diff --git a/a/1.txt b/N1/1.txt index 5daeb78..a667a95 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,8 +25,9 @@ No worries. > >>>>>>>>> #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 61c1ff6..0488f84 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0521BC8DA.3010308@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, 27 Aug 2013 06:41:48 +0000\0" + "Date\0Tue, 27 Aug 2013 08:41:48 +0200\0" "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Cc\0netdev@vger.kernel.org" davem@davemloft.net @@ -38,8 +38,9 @@ "> >>>>>>>>> #define SH4_SKB_RX_ALIGN 32\n" "> >>>>>>>>> \n" "> >>>>>>>>> Index: net-next/include/linux/sh_eth.h\n" - "> >>>>>>>>> =================================\n" - "> >>>>>>>>> > >>>>>>>>> --- net-next.orig/include/linux/sh_eth.h\n" + "> >>>>>>>>> ==================================================================\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" @@ -152,4 +153,4 @@ "\n" Laurent Pinchart -6e19b48e2e59b19bc1616793bea60b885caa71be054630a5d2eb5a34f4ef62ab +5b99c6445c04bedccc279685495e55985d46a520f0dcec2b876737bada857e36
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.