[parisc-linux-cvs] linux-2.5 jejb

James Bottomley parisc-linux@lists.parisc-linux.org
Tue, 24 Dec 2002 16:25:17 -0700 (MST)


CVSROOT:	/var/cvs
Module name:	linux-2.5
Changes by:	jejb	02/12/24 16:25:17

Modified files:
	drivers/scsi   : sr_ioctl.c 

Log message:
correct cvs automatic merge problem, spotted by bitkeeper