Merge branch 'uuid-types' of bombadil.infradead.org:public_git/uuid into nvme-base
authorChristoph Hellwig <hch@lst.de>
Tue, 13 Jun 2017 09:45:14 +0000 (11:45 +0200)
committerChristoph Hellwig <hch@lst.de>
Tue, 13 Jun 2017 09:45:14 +0000 (11:45 +0200)
1  2 
MAINTAINERS
drivers/md/md.c
drivers/nvme/host/fc.c
drivers/scsi/scsi_debug.c
fs/ext4/super.c
fs/gfs2/ops_fstype.c
include/linux/fs.h

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/md/md.c
Simple merge
Simple merge
Simple merge
diff --cc fs/ext4/super.c
Simple merge
Simple merge
Simple merge