Merge remote-tracking branch 'scsi/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 16 Jan 2014 05:15:18 +0000 (16:15 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 16 Jan 2014 05:15:18 +0000 (16:15 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 05:15:18 +0000 (16:15 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 05:15:18 +0000 (16:15 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/scsi/Kconfig
Simple merge
diff --cc drivers/scsi/qla2xxx/qla_nx2.c
Simple merge
diff --cc drivers/scsi/sd.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 16 Jan 2014 05:15:18 +0000 (16:15 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 16 Jan 2014 05:15:18 +0000 (16:15 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_nx2.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	patch \|	diff1 \|	diff2 \|	blob \| history