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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (102 commits)
  [SCSI] scsi_dh: fix kconfig related build errors
  [SCSI] sym53c8xx: Fix bogus sym_que_entry re-implementation of container_of
  [SCSI] scsi_cmnd.h: remove double inclusion of linux/blkdev.h
  [SCSI] make struct scsi_{host,target}_type static
  [SCSI] fix locking in host use of blk_plug_device()
  [SCSI] zfcp: Cleanup external header file
  [SCSI] zfcp: Cleanup code in zfcp_erp.c
  [SCSI] zfcp: zfcp_fsf cleanup.
  [SCSI] zfcp: consolidate sysfs things into one file.
  [SCSI] zfcp: Cleanup of code in zfcp_aux.c
  [SCSI] zfcp: Cleanup of code in zfcp_scsi.c
  [SCSI] zfcp: Move status accessors from zfcp to SCSI include file.
  [SCSI] zfcp: Small QDIO cleanups
  [SCSI] zfcp: Adapter reopen for large number of unsolicited status
  [SCSI] zfcp: Fix error checking for ELS ADISC requests
  [SCSI] zfcp: wait until adapter is finished with ERP during auto-port
  [SCSI] ibmvfc: IBM Power Virtual Fibre Channel Adapter Client Driver
  [SCSI] sg: Add target reset support
  [SCSI] lib: Add support for the T10 (SCSI) Data Integrity Field CRC
  [SCSI] sd: Move scsi_disk() accessor function to sd.h
  ...

diff --cc block/bsg.c
Simple merge

diff --cc drivers/infiniband/ulp/iser/iscsi_iser.c
Simple merge

diff --cc drivers/infiniband/ulp/iser/iscsi_iser.h
Simple merge

diff --cc drivers/infiniband/ulp/iser/iser_initiator.c
Simple merge

diff --cc drivers/infiniband/ulp/iser/iser_memory.c
Simple merge

diff --cc drivers/infiniband/ulp/iser/iser_verbs.c
Simple merge

diff --cc drivers/message/fusion/mptbase.c
Simple merge

diff --cc drivers/message/fusion/mptctl.c
Simple merge

diff --cc drivers/message/fusion/mptspi.c
Simple merge

diff --cc drivers/scsi/aacraid/linit.c
Simple merge

diff --cc drivers/scsi/esp_scsi.c
Simple merge

diff --cc drivers/scsi/hosts.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc include/scsi/scsi_device.h
Simple merge

diff --cc lib/Makefile
Simple merge