Re: [U-Boot] [PATCH-OMAP3] OMAP3: Fix merge error in omap3 header