diff for duplicates of <1362815.uO65s14ojU@avalon> diff --git a/a/1.txt b/N1/1.txt index fe4ddf3..8b3df71 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -119,7 +119,7 @@ index 7b53cda..b5bbab7 100644 - iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc)); + sh7372_map_io(); + - /* DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't + /* DMA memory@0xff200000 - 0xffdfffff. The default 2MB size isn't * enough to allocate the frame buffer memory. */ init_consistent_dma_size(12 << 20); diff --git a/a/content_digest b/N1/content_digest index 86793df..861a8f1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,8 @@ "ref\020120315175000.897f1172c296d4a687be0537@canb.auug.org.au\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: linux-next: manual merge of the arm-soc tree with Linus' tree\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0linux-next: manual merge of the arm-soc tree with Linus' tree\0" "Date\0Thu, 15 Mar 2012 10:51:06 +0100\0" - "To\0Stephen Rothwell <sfr@canb.auug.org.au>\0" - "Cc\0Olof Johansson <olof@lixom.net>" - Arnd Bergmann <arnd@arndb.de> - linux-arm-kernel@lists.infradead.org - linux-next@vger.kernel.org - linux-kernel@vger.kernel.org - Magnus Damm <damm@opensource.se> - Rafael J. Wysocki <rjw@sisk.pl> - " Paul Mundt <lethal@linux-sh.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Stephen,\n" @@ -134,7 +126,7 @@ "-\tiotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc));\n" "+\tsh7372_map_io();\n" "+\n" - " \t/* DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't\n" + " \t/* DMA memory@0xff200000 - 0xffdfffff. The default 2MB size isn't\n" " \t * enough to allocate the frame buffer memory.\n" " \t */\n" " \tinit_consistent_dma_size(12 << 20);\n" @@ -212,4 +204,4 @@ "\n" Laurent Pinchart -a4c6e5a858f46f13ff3aa6be55a9e601d55752133fb5c76fddb6249dfd924e0a +1588eda59490cb35fcc0266eae568b2b59cd146abe683fc7cfe51dd313f43c12
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.