Messages in this thread | | | Date | Mon, 24 Aug 2009 18:23:15 +1000 | From | Stephen Rothwell <> | Subject | Re: 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] | |