Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (207 commits)
  [SCSI] gdth: fix CONFIG_ISA build failure
  [SCSI] esp_scsi: remove __dev{init,exit}
  [SCSI] gdth: !use_sg cleanup and use of scsi accessors
  [SCSI] gdth: Move members from SCp to gdth_cmndinfo, stage 2
  [SCSI] gdth: Setup proper per-command private data
  [SCSI] gdth: Remove gdth_ctr_tab[]
  [SCSI] gdth: switch to modern scsi host registration
  [SCSI] gdth: gdth_interrupt() gdth_get_status() & gdth_wait() fixes
  [SCSI] gdth: clean up host private data
  [SCSI] gdth: Remove virt hosts
  [SCSI] gdth: Reorder scsi_host_template intitializers
  [SCSI] gdth: kill gdth_{read,write}[bwl] wrappers
  [SCSI] gdth: Remove 2.4.x support, in-kernel changelog
  [SCSI] gdth: split out pci probing
  [SCSI] gdth: split out eisa probing
  [SCSI] gdth: split out isa probing
  gdth: Make one abuse of scsi_cmnd less obvious
  [SCSI] NCR5380: Use scsi_eh API for REQUEST_SENSE invocation
  [SCSI] usb storage: use scsi_eh API in REQUEST_SENSE execution
  [SCSI] scsi_error: Refactoring scsi_error to facilitate in synchronous REQUEST_SENSE
  ...

1 files changed, 12 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 012fa837845d..12cee3da2625 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -297,6 +297,12 @@ P:	Colin Leroy
 M:      colin@colino.net
 S:      Maintained
 
+ADVANSYS SCSI DRIVER
+P:      Matthew Wilcox
+M:      matthew@wil.cx
+L:      linux-scsi@vger.kernel.org
+S:      Maintained
+
 AEDSP16 DRIVER
 P:      Riccardo Facchetti
 M:      fizban@tin.it
@@ -1889,6 +1895,11 @@ M:	Gadi Oxman <gadio@netvision.net.il>
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+IDE-SCSI DRIVER
+L:      linux-ide@vger.kernel.org
+L:      linux-scsi@vger.kernel.org
+S:      Orphan
+
 IEEE 1394 SUBSYSTEM
 P:      Ben Collins
 M:      ben.collins@ubuntu.com
@@ -2404,7 +2415,7 @@ LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 P:      Eric Moore
 M:      Eric.Moore@lsi.com
 M:      support@lsi.com
-L:      mpt_linux_developer@lsi.com
+L:      DL-MPTFusionLinux@lsi.com
 L:      linux-scsi@vger.kernel.org
 W:      http://www.lsilogic.com/support
 S:      Supported