Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755617Ab0HGLhW (ORCPT ); Sat, 7 Aug 2010 07:37:22 -0400 Received: from ozlabs.org ([203.10.76.45]:42696 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753389Ab0HGLhU (ORCPT ); Sat, 7 Aug 2010 07:37:20 -0400 Date: Sat, 7 Aug 2010 21:37:09 +1000 From: Paul Mackerras To: Linus Torvalds Cc: Thomas Gleixner , Benjamin Herrenschmidt , Andrew Morton , Ingo Molnar , LKML Subject: Re: [GIT pull] timekeeping updates for 2.6.36 Message-ID: <20100807113709.GA6242@brick.ozlabs.ibm.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 653 Lines: 17 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/