From /pub/scm/linux/kernel/git/torvalds/linux-2.6
   b1721d0..c3bf9bc  master     -> linus
Switched to branch "2.6.25-mc15"
warning: too many files, skipping inexact rename detection
fatal: '/pub/scm/linux/kernel/git/davem/net-2.6.25.git': unable to chdir or not a git archive
fatal: The remote end hung up unexpectedly
error: branch 'net' not found.
Already on "2.6.25-mc15"

# git /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git	master		scsi-misc
##
Merge made by recursive.
 block/bsg.c                               |   43 +-
 drivers/misc/enclosure.c                  |  100 +++-
 drivers/s390/scsi/zfcp_fsf.c              |   39 +-
 drivers/s390/scsi/zfcp_fsf.h              |   18 +-
 drivers/s390/scsi/zfcp_scsi.c             |  114 ++++
 drivers/scsi/FlashPoint.c                 |    2 +-
 drivers/scsi/Kconfig                      |   10 +
 drivers/scsi/Makefile                     |    1 +
 drivers/scsi/aha152x.c                    |    7 +-
 drivers/scsi/aha1542.c                    |   26 +-
 drivers/scsi/aic7xxx/aic79xx.reg          |    2 +-
 drivers/scsi/aic7xxx/aic79xx_core.c       |  771 ++++++++++++++++++++++++-
 drivers/scsi/aic7xxx/aic79xx_inline.h     |  903 +++--------------------------
 drivers/scsi/aic7xxx/aic79xx_osm.c        |  162 +++++-
 drivers/scsi/aic7xxx/aic79xx_osm.h        |  178 +------
 drivers/scsi/aic7xxx/aic79xx_osm_pci.c    |   29 +-
 drivers/scsi/aic7xxx/aic7xxx.reg          |    2 +-
 drivers/scsi/aic7xxx/aic7xxx_core.c       |  508 ++++++++++++++++-
 drivers/scsi/aic7xxx/aic7xxx_inline.h     |  609 ++------------------
 drivers/scsi/aic7xxx/aic7xxx_osm.c        |   77 +++-
 drivers/scsi/aic7xxx/aic7xxx_osm.h        |  139 +----
 drivers/scsi/aic7xxx/aic7xxx_osm_pci.c    |   69 ++-
 drivers/scsi/aic7xxx/aicasm/aicasm_gram.y |   93 ++--
 drivers/scsi/aic7xxx/aicasm/aicasm_scan.l |   18 +-
 drivers/scsi/eata.c                       |   11 +-
 drivers/scsi/esp_scsi.c                   |   35 +-
 drivers/scsi/esp_scsi.h                   |   13 +-
 drivers/scsi/hosts.c                      |   29 +-
 drivers/scsi/lpfc/lpfc_attr.c             |   10 +-
 drivers/scsi/mac_esp.c                    |  657 +++++++++++++++++++++
 drivers/scsi/qla2xxx/qla_attr.c           |    8 +-
 drivers/scsi/scsi_priv.h                  |    1 +
 drivers/scsi/scsi_proc.c                  |    7 +-
 drivers/scsi/scsi_scan.c                  |   84 ++--
 drivers/scsi/scsi_sysfs.c                 |  142 +++---
 drivers/scsi/scsi_transport_fc.c          |   60 ++-
 drivers/scsi/scsi_transport_sas.c         |   22 +-
 drivers/scsi/scsi_transport_spi.c         |   33 +-
 drivers/scsi/st.c                         |   10 +-
 drivers/scsi/u14-34f.c                    |    9 +-
 fs/sysfs/file.c                           |   14 +-
 fs/sysfs/group.c                          |   83 +++-
 fs/sysfs/sysfs.h                          |    2 +
 include/linux/bsg.h                       |   14 +-
 include/linux/sysfs.h                     |    4 +-
 include/scsi/scsi_device.h                |    3 +-
 46 files changed, 3122 insertions(+), 2049 deletions(-)
 create mode 100644 drivers/scsi/mac_esp.c
##
# gitfetch /pub/scm/linux/kernel/git/davem/net-2.6.25.git	master		net
##
BRANCH master not in tree /pub/scm/linux/kernel/git/davem/net-2.6.25.git, SKIPPING
##
# merge net resolve /home/jejb/net-resolve.diff
##
MERGE net not in tree, SKIPPING
##
# check
##
Differences exist, continuing
##
# label
##
Created commit e5970cb: 2.6.25-mc15
 1 files changed, 1 insertions(+), 1 deletions(-)
##
# diff /pub/linux/kernel/people/jejb/merge-tree/patch-
##
##
# log /pub/linux/kernel/people/jejb/merge-tree/log-
##