Re: linux-next: manual merge of the tip tree with the s390 tree

From: Stephen Rothwell
Date: Mon Aug 24 2009 - 04:23:28 EST

Hi Heiko,

On Mon, 24 Aug 2009 10:17:23 +0200 Heiko Carstens <heiko.carstens@xxxxxxxxxx> wrote:
> I reverted the sched_clock_base_cc rename. The merge conflict
> should be gone as soon as Martin pushes a new tree out.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature