Merge branch 'uuid-types'

Merge 'uuid-types' from git://git.infradead.org/users/hch/uuid.git

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/nvme/host/fc.c
Simple merge

diff --cc drivers/scsi/scsi_debug.c
Simple merge

diff --cc drivers/usb/host/xhci-pci.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge