[parisc-linux-cvs] linux-2.6 jejb

[James Bottomley]

CVSROOT:	/var/cvs
Module name:	linux-2.6
Changes by:	jejb	04/07/27 15:19:51

Modified files:
	.              : Makefile 
	drivers/scsi   : ncr53c8xx.c 
	include/asm-parisc: pgtable.h 

Log message:
Fix some mismerges