Re: [GIT pull] timekeeping updates for 2.6.36

[Paul Mackerras]

On Fri, Aug 06, 2010 at 01:25:22PM -0700, Linus Torvalds wrote:

> Well, it just resulted in another merge conflict, but I resolved it
> the same way you had resolved your cherry-picks. However, I wanted to
> let people know, so that the powerpc guys can re-verify that whole
> vsyscall timer change.
> 
> So Paul, Ben, please check out that I didn't screw something up in there.

Looks fine, thanks.

Paul.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/