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

Pull in Broadcom MPI/MPT fixes that conflicted with patch resolution
upstream.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>