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)
commitfdd050b5b3c96813ae6756ed68157d32ba31b9f2
treeca1a216730e32471cd17886d9de1902228bc340c
parentf06345add95f388519e83ec398134853e0f64ac9
parent87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83
Merge branch 'uuid-types' of bombadil.infradead.org:public_git/uuid into nvme-base
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