[parisc-linux] files still needing manual merging

Grant Grundler grundler@cup.hp.com
Tue, 08 Feb 2000 16:39:31 -0800


Michael Ang wrote:
> Conflicted files which still need to be manually merged using 'cvs up
> -jlinus2329 -jlinus2342'

> `drivers/char/serial.c'

Done. It should be ok now.

grant

Grant Grundler
Unix Development Lab
+1.408.447.7253