Tony Lindgren <tony@xxxxxxxxxxx> writes: > * Kevin Hilman <khilman@xxxxxx> [110623 17:32]: >> Tony, >> >> Please pull the following misc. OMAP PM updates targetted for v3.1. >> >> This branch is based on your 'fixes' branch due to some dependencies. >> OMAP2: PM debug: move wakeup timer into clockevent code > > This won't work with the devel-timer branch. I think we should just > drop it for now based on what I mentioned in the other thread. Hmm, so it's not just the wakeup timer that conflicts between devel-timer and my pm-misc branch. My branch also removes a bunch of other stuff from pm-debug.c and pm.h so it has overlapping changes with your devel-timer branch. The conflicts are easy enough to resolve since both branches are just removing code. Is your devel-timer branch stable now? Should I rebase my branch on top of devel-timer? or can you just handle the conflicts? Kevin -- 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
