Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] mpt2sas: fix driver version inconsistency
  [SCSI] 3w-xxxx: scsi_dma_unmap fix
  [SCSI] 3w-9xxx: scsi_dma_unmap fix
  [SCSI] ses: fix problems caused by empty SES provided name
  [SCSI] fc-transport: Close state transition-window during rport deletion.
  [SCSI] initialize max_target_blocked in scsi_alloc_target
  [SCSI] fnic: Add new Cisco PCI-Express FCoE HBA

diff --combined MAINTAINERS
index 64ea80e,c7bed16..77cbfb1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1431,6 -1431,14 +1431,14 @@@ P:    Russell Kin
  M:    linux@arm.linux.org.uk
  F:    include/linux/clk.h
  
+ CISCO FCOE HBA DRIVER
+ P:    Abhijeet Joglekar
+ M:    abjoglek@cisco.com
+ P:    Joe Eykholt
+ M:    jeykholt@cisco.com
+ L:    linux-scsi@vger.kernel.org
+ S:    Supported
+ 
  CODA FILE SYSTEM
  P:    Jan Harkes
  M:    jaharkes@cs.cmu.edu
@@@ -5579,14 -5587,6 +5587,14 @@@ M:    ian@mnementh.co.u
  S:    Maintained
  F:    drivers/mmc/host/tmio_mmc.*
  
 +TMPFS (SHMEM FILESYSTEM)
 +P:    Hugh Dickins
 +M:    hugh.dickins@tiscali.co.uk
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +F:    include/linux/shmem_fs.h
 +F:    mm/shmem.c
 +
  TPM DEVICE DRIVER
  P:    Debora Velarde
  M:    debora@linux.vnet.ibm.com