Merge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6