Merge remote-tracking branch 'target-updates/for-next'

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

Fri, 28 Jun 2013 02:58:24 +0000 (12:58 +1000)

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

Fri, 28 Jun 2013 02:58:24 +0000 (12:58 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 02:58:24 +0000 (12:58 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 02:58:24 +0000 (12:58 +1000)
diff --cc drivers/scsi/qla2xxx/tcm_qla2xxx.c
Simple merge
diff --cc drivers/target/iscsi/iscsi_target_configfs.c
Simple merge
diff --cc drivers/target/iscsi/iscsi_target_nego.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 02:58:24 +0000 (12:58 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 02:58:24 +0000 (12:58 +1000)
		1	2
drivers/scsi/qla2xxx/tcm_qla2xxx.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/target/iscsi/iscsi_target_configfs.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/target/iscsi/iscsi_target_nego.c	patch \|	diff1 \|	diff2 \|	blob \| history