[parisc-linux-cvs] linux-2.6 tausq

Randolph Chung parisc-linux@lists.parisc-linux.org
Fri, 17 Oct 2003 18:40:53 -0600 (MDT) 

CVSROOT:	/var/cvs
Module name:	linux-2.6
Changes by:	tausq	03/10/17 18:40:53

Modified files:
	kernel         : resource.c 

Log message:
fix merge error