Merge branch 'scsi-fixes'
James Bottomley [Sat, 23 Jul 2011 17:09:03 +0000 (21:09 +0400)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge