diff for duplicates of <20110107135217.GA3760@linux-sh.org> diff --git a/a/1.txt b/N1/1.txt index bcdd0ac..cb86bc1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -57,7 +57,8 @@ index e041c53,1523369..0000000 zoom_debugboard_init(); ++<<<<<<< HEAD:arch/arm/mach-omap2/board-zoom.c + zoom_peripherals_init(); -++===+ zoom_display_init(); +++======= ++ zoom_display_init(); + + omap_mux_init_gpio(64, OMAP_PIN_OUTPUT); + usb_ehci_init(&ehci_pdata); diff --git a/a/content_digest b/N1/content_digest index 9a9b2aa..523ec46 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\01294407452.3968.81.camel@nubuntu\0" "From\0Paul Mundt <lethal@linux-sh.org>\0" "Subject\0Re: [GIT PULL] OMAP DSS changes for .38 merge window\0" - "Date\0Fri, 07 Jan 2011 13:52:17 +0000\0" + "Date\0Fri, 7 Jan 2011 22:52:17 +0900\0" "To\0Tomi Valkeinen <tomi.valkeinen@nokia.com>\0" "Cc\0linux-fbdev@vger.kernel.org <linux-fbdev@vger.kernel.org>" linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> @@ -69,7 +69,8 @@ " \tzoom_debugboard_init();\n" "++<<<<<<< HEAD:arch/arm/mach-omap2/board-zoom.c\n" " +\tzoom_peripherals_init();\n" - "++===+ \tzoom_display_init();\n" + "++=======\n" + "+ \tzoom_display_init();\n" "+ \n" "+ \tomap_mux_init_gpio(64, OMAP_PIN_OUTPUT);\n" "+ \tusb_ehci_init(&ehci_pdata);\n" @@ -93,4 +94,4 @@ "It looks like there has been some consolidation work based on the last commit,\n" but I'll leave it to you to decide how to handle. -7ad16947c8ce6e1cf7438f343028cbdea8ccb122e2fb4ed19ca96297c7aaf452 +62f77f877d09313f300b9f4bcfa344dd2ad8f4ecb439ee344cbb0b2a20eaf646
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.