[parisc-linux-cvs] linux jsm

John Marvin jsm@puffin.external.hp.com
Thu, 5 Jul 2001 17:04:17 -0600 

CVSROOT:	/home/cvs/parisc
Module name:	linux
Changes by:	jsm	01/07/05 17:04:17

Modified files:
	init           : main.c 

Log message:
Fix merge 2.4.6 merge conflicts