Merge branch 'fixes' into misc

author James Bottomley <[email protected]>

Wed, 18 May 2016 01:12:50 +0000 (21:12 -0400)

committer James Bottomley <[email protected]>

Wed, 18 May 2016 01:12:50 +0000 (21:12 -0400)
author James Bottomley <[email protected]>
Wed, 18 May 2016 01:12:50 +0000 (21:12 -0400)
committer James Bottomley <[email protected]>
Wed, 18 May 2016 01:12:50 +0000 (21:12 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/scsi/device_handler/scsi_dh_alua.c
Simple merge
author	James Bottomley <[email protected]>
	Wed, 18 May 2016 01:12:50 +0000 (21:12 -0400)
committer	James Bottomley <[email protected]>
	Wed, 18 May 2016 01:12:50 +0000 (21:12 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/device_handler/scsi_dh_alua.c	patch \|	diff1 \|	diff2 \|	blob \| history