lkml.org 
[lkml]   [2009]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tip tree with the s390 tree
Hi Heiko,

On Mon, 24 Aug 2009 10:17:23 +0200 Heiko Carstens <heiko.carstens@de.ibm.com> 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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2009-08-24 10:25    [W:0.027 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site