[parisc-linux-cvs] linux bame

Paul Bame bame@puffin.external.hp.com
Thu, 5 Jul 2001 15:55:32 -0600


CVSROOT:	/home/cvs/parisc
Module name:	linux
Changes by:	bame	01/07/05 15:55:31

Modified files:
	.              : Makefile 
	Documentation  : Configure.help 

Log message:
resolved 2.4.6 merge conflicts.  pa-specific stuff remains in Makefile