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

[Stephen Rothwell]

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.

Thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature