* Kevin Hilman [off-list ref] [110627 09:45]:

Tony Lindgren [off-list ref] writes:

quoted

* Kevin Hilman [off-list ref] [110623 17:32]:

quoted

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.

OK thanks for checking.
 

Is your devel-timer branch stable now?  Should I rebase my branch on top
of devel-timer?  or can you just handle the conflicts?

Just pushed what hopefully is the last version. But since there may
still be some comments, it's probably best that I resolve the
conflicts when merging.

Tony