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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] ibmvscsi: Prevent IO during partner login
  [SCSI] lpfc : Correct queue tag handling
  [SCSI] Update MAINTAINER email address and trees
  [SCSI] osst: fix if (...) \n #if... cases missing semicolons when false

diff --combined MAINTAINERS
index 6c0e44bbf601849ff78d18f2bb63ef423c2fe6b9,b03014d8357cced842fe84c6f935344c5e5d0c53..1c7c229a092665b11cd46a25dbd40feeb31661d9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -216,7 -216,7 +216,7 @@@ P: Len Brow
  M:    len.brown@intel.com
  M:    lenb@kernel.org
  L:    linux-acpi@vger.kernel.org
 -W:    http://acpi.sourceforge.net/
 +W:    http://www.lesswatts.org/projects/acpi/
  T:    git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
  S:    Supported
  
@@@ -235,8 -235,8 +235,8 @@@ W: http://acpi.sourceforge.net
  S:    Supported
  
  ACPI FAN DRIVER
 -P:    Konstantin A. Karasyov
 -M:    konstantin.a.karasyov@intel.com
 +P:    Len Brown
 +M:    len.brown@intel.com
  L:    linux-acpi@vger.kernel.org
  W:    http://acpi.sourceforge.net/
  S:    Supported
@@@ -248,15 -248,15 +248,15 @@@ L:      pcihpd-discuss@lists.sourceforge.ne
  S:    Supported
  
  ACPI THERMAL DRIVER
 -P:    Konstantin A. Karasyov
 -M:    konstantin.a.karasyov@intel.com
 +P:    Len Brown
 +M:    len.brown@intel.com
  L:    linux-acpi@vger.kernel.org
  W:    http://acpi.sourceforge.net/
  S:    Supported
  
  ACPI VIDEO DRIVER
 -P:    Luming Yu
 -M:    luming.yu@intel.com
 +P:    Rui Zhang
 +M:    rui.zhang@intel.com
  L:    linux-acpi@vger.kernel.org
  W:    http://acpi.sourceforge.net/
  S:    Supported
@@@ -398,12 -398,6 +398,12 @@@ P:       Arnaldo Carvalho de Mel
  M:    acme@ghostprotocols.net
  S:    Maintained
  
 +APPLETOUCH TOUCHPAD DRIVER
 +P:    Johannes Berg
 +M:    johannes@sipsolutions.net
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +
  ARC FRAMEBUFFER DRIVER
  P:    Jaya Kumar
  M:    jayalk@intworks.biz
@@@ -1707,7 -1701,7 +1707,7 @@@ S:      Maintaine
  HID CORE LAYER
  P:    Jiri Kosina
  M:    jkosina@suse.cz
 -L:    linux-input@atrey.karlin.mff.cuni.cz
 +L:    linux-input@vger.kernel.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
  
@@@ -1933,7 -1927,8 +1933,7 @@@ INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCH
  P:    Dmitry Torokhov
  M:    dmitry.torokhov@gmail.com
  M:    dtor@mail.ru
 -L:    linux-input@atrey.karlin.mff.cuni.cz
 -L:    linux-joystick@atrey.karlin.mff.cuni.cz
 +L:    linux-input@vger.kernel.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
  S:    Maintained
  
@@@ -2549,7 -2544,7 +2549,7 @@@ S:      Supporte
  
  MISCELLANEOUS MCA-SUPPORT
  P:    James Bottomley
- M:    jejb@steeleye.com
+ M:    James.Bottomley@HansenPartnership.com
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
@@@ -3301,9 -3296,11 +3301,11 @@@ S:    Maintaine
  
  SCSI SUBSYSTEM
  P:    James E.J. Bottomley
- M:    James.Bottomley@SteelEye.com
+ M:    James.Bottomley@HansenPartnership.com
  L:    linux-scsi@vger.kernel.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
+ T:    git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
+ T:    git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-pending-2.6.git
  S:    Maintained
  
  SCSI TAPE DRIVER
@@@ -3477,14 -3474,12 +3479,14 @@@ L:   linux-pm@lists.linux-foundation.or
  S:    Supported
  
  SUSPEND TO RAM:
 +P:    Len Brown
 +M:    len.brown@intel.com
  P:    Pavel Machek
  M:    pavel@suse.cz
  P:    Rafael J. Wysocki
  M:    rjw@sisk.pl
  L:    linux-pm@lists.linux-foundation.org
 -S:    Maintained
 +S:    Supported
  
  SONIC NETWORK DRIVER
  P:    Thomas Bogendoerfer