From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6
   b18cae4..c48c43e  master     -> origin/master
From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
 + 8b5919a...df30e50 master     -> scsi-misc  (forced update)
Switched to branch '2.6.36-stor2'
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.
r-linus block-for-linus
##
Auto-merging block/blk-core.c
Merge made by recursive.
 block/blk-core.c         |   24 ++++++++----------------
 block/blk-merge.c        |    2 +-
 block/blk.h              |    4 ++++
 block/genhd.c            |   14 --------------
 fs/partitions/check.c    |   12 ------------
 include/linux/blkdev.h   |    1 -
 include/linux/elevator.h |    2 --
 include/linux/genhd.h    |    1 -
 8 files changed, 13 insertions(+), 47 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.