]> err.no Git - linux-2.6/commit
merge by hand - fix up rejections in Documentation/DocBook/Makefile
authorJames Bottomley <jejb@titanic.(none)>
Fri, 20 May 2005 20:27:44 +0000 (15:27 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Fri, 20 May 2005 20:27:44 +0000 (15:27 -0500)
commitad34ea2cc3845ef4dcd7d12fb0fa8484734bd672
treead434400f5ecaa33b433c8f830e40792d8d6c05c
parent90356ac3194bf91a441a5f9c3067af386ef62462
parent88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Documentation/DocBook/Makefile
drivers/scsi/Kconfig
drivers/scsi/NCR53C9x.c
drivers/scsi/aacraid/linit.c
drivers/scsi/scsi.c
drivers/scsi/scsi_error.c