Hi,
On Tue, Dec 15, 2009 at 02:05:46PM +0100, Balbi Felipe (Nokia-D/Helsinki) wrote:
also, this patch doesn't apply neither on top of linus's master nor
tony's master:
$ git am ~/check.diff
Applying: mfd: twl: fix twl4030 rename for remaining driver, board files
error: patch failed: drivers/video/omap/lcd_omap2evm.c:24
error: drivers/video/omap/lcd_omap2evm.c: patch does not apply
error: patch failed: drivers/video/omap/lcd_omap3beagle.c:23
error: drivers/video/omap/lcd_omap3beagle.c: patch does not apply
error: patch failed: drivers/video/omap/lcd_omap3evm.c:23
error: drivers/video/omap/lcd_omap3evm.c: patch does not apply
Patch failed at 0001 mfd: twl: fix twl4030 rename for remaining driver, board files
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
please rebase.
<fixed tony's address>
and btw, linux-omap doesn't have this problem (just yet). It's missing a
merge.
--
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
