##
# Master file for creating a merge tree
##
# First the setup
setup stor /pub/scm/linux/kernel/git/jejb/storage-tree
errors	/pub/linux/kernel/people/jejb/storage-tree/log-error-
mail	jejb
master /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 scsi-misc
git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git	master		scsi-rc-fixes
git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git	for-linus block-for-linus
git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git	for-next block-for-next
git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-fixes
git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream
quilt   /pub/linux/kernel/people/agk/patches/2.6/editing/ device-mapper section NEXT_PATCHES
gitrebase /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git	master	scsi-post-merge	merge-base
check
label
diff /pub/linux/kernel/people/jejb/storage-tree/patch-
log /pub/linux/kernel/people/jejb/storage-tree/log-