Merge HEAD from ../scsi-misc-2.6-tmp

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/scsi/aacraid/aacraid.h
Simple merge

diff --cc drivers/scsi/aacraid/linit.c
Simple merge

diff --cc drivers/scsi/aic7xxx/aic7xxx_osm.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/scsi_scan.c
Simple merge

diff --cc drivers/scsi/scsi_transport_fc.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc drivers/scsi/st.c
Simple merge