Merge by hand (conflicts in scsi_lib.c)
[safe/jmp/linux-2.6] / drivers / scsi / aha152x.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2