From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6
   0a59228..55ec86f  master     -> origin/master
Switched to branch '2.6.37-rc5-stor12'
From .
 * branch            scsi-rc-fixes -> FETCH_HEAD
From .
 * branch            block-for-linus -> FETCH_HEAD
From .
 * branch            block-for-next -> FETCH_HEAD
Died at /pub/linux/kernel/people/jejb/build.pl line 103.
-2.6.git	master		scsi-rc-fixes
##
Merge made by recursive.
 MAINTAINERS                                |   11 +++++++-
 Makefile                                   |    2 +-
 arch/x86/crypto/ghash-clmulni-intel_glue.c |    1 +
 drivers/block/xen-blkfront.c               |    2 +-
 drivers/i2c/busses/i2c-intel-mid.c         |    2 +-
 drivers/md/md.c                            |   39 ++++++++++++++-------------
 drivers/md/raid10.c                        |    2 +-
 drivers/net/xen-netfront.c                 |    4 +-
 drivers/spi/dw_spi.c                       |    5 +++
 fs/exec.c                                  |    5 +++
 fs/ext4/ext4.h                             |    1 +
 fs/ext4/inode.c                            |    5 +++-
 fs/ext4/namei.c                            |    2 +-
 fs/ext4/super.c                            |   14 ++++++++-
 include/xen/interface/io/ring.h            |   11 ++++++-
 kernel/workqueue.c                         |    7 +++--
 mm/mmap.c                                  |   16 ++++++++---
 17 files changed, 90 insertions(+), 39 deletions(-)
##
# git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git	for-linus block-for-linus
##
Auto-merging drivers/md/md.c
Auto-merging drivers/scsi/scsi_lib.c
Merge made by recursive.
 block/blk-map.c                    |    5 ++-
 block/blk-merge.c                  |    6 ++--
 block/blk-settings.c               |   51 +++++++++++++++--------------------
 block/blk-sysfs.c                  |    2 +-
 block/blk-throttle.c               |   39 +++++++++++++++++----------
 drivers/block/cciss.c              |    2 +
 drivers/block/drbd/drbd_receiver.c |   14 +++++----
 drivers/block/drbd/drbd_req.h      |    3 +-
 drivers/block/drbd/drbd_worker.c   |   10 ++++++-
 drivers/md/dm-table.c              |   10 +-----
 drivers/md/md.c                    |    3 --
 drivers/scsi/scsi_lib.c            |    3 +-
 include/linux/blkdev.h             |   10 +++++--
 13 files changed, 85 insertions(+), 73 deletions(-)
##
# git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git	for-next block-for-next
##
Auto-merging block/ioctl.c
Auto-merging drivers/md/dm-table.c
Auto-merging drivers/md/md.c
Auto-merging drivers/scsi/scsi_lib.c
Auto-merging drivers/scsi/sd.c
CONFLICT (content): Merge conflict in drivers/scsi/sd.c
Auto-merging fs/block_dev.c
Auto-merging fs/btrfs/volumes.c
Auto-merging fs/btrfs/volumes.h
Auto-merging fs/ext3/super.c
Auto-merging fs/ext4/super.c
Auto-merging fs/ocfs2/cluster/heartbeat.c
Auto-merging fs/reiserfs/journal.c
Auto-merging fs/splice.c
Auto-merging include/linux/blkdev.h
Auto-merging include/linux/fs.h
Auto-merging kernel/power/swap.c
Automatic merge failed; fix conflicts and then commit the result.