Merge branch '6.2/mpt-mpi' into 6.2/scsi-fixes