From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6
   814ce25..f6614b7  master     -> origin/master
Switched to branch '2.6.37-rc1-stor2'
From .
 * branch            scsi-rc-fixes -> FETCH_HEAD
From /pub/scm/linux/kernel/git/axboe/linux-2.6-block
 + 4429838...d7d76ff for-linus  -> block-for-linus  (forced update)
From .
 * branch            block-for-linus -> FETCH_HEAD
From .
 * branch            block-for-next -> FETCH_HEAD
warning: too many files (created: 1642 deleted: 802), skipping inexact rename detection
Died at /pub/linux/kernel/people/jejb/build.pl line 103.
    4 ++--
 block/blk-map.c               |    2 ++
 block/compat_ioctl.c          |    4 ++--
 block/ioctl.c                 |    7 ++++---
 block/scsi_ioctl.c            |   34 ++++++++++++++++++++++++----------
 drivers/block/cciss.c         |    3 ++-
 drivers/block/drbd/drbd_int.h |    2 +-
 drivers/md/md.c               |   20 ++++++++++----------
 fs/bio.c                      |    9 ++++++++-
 fs/ioprio.c                   |   18 ++++++++++++++++--
 10 files changed, 71 insertions(+), 32 deletions(-)
##
# git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git	for-next block-for-next
##
Auto-merging fs/ocfs2/file.c
CONFLICT (content): Merge conflict in fs/ocfs2/file.c
Automatic merge failed; fix conflicts and then commit the result.