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

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

Wed, 10 Oct 2012 00:37:55 +0000 (11:37 +1100)

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

Wed, 10 Oct 2012 00:37:55 +0000 (11:37 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 00:37:55 +0000 (11:37 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 00:37:55 +0000 (11:37 +1100)
diff --cc drivers/scsi/qla2xxx/qla_target.c
Simple merge
diff --cc drivers/target/iscsi/iscsi_target_parameters.c
Simple merge
diff --cc drivers/usb/gadget/tcm_usb_gadget.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 10 Oct 2012 00:37:55 +0000 (11:37 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 10 Oct 2012 00:37:55 +0000 (11:37 +1100)
		1	2
drivers/scsi/qla2xxx/qla_target.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/target/iscsi/iscsi_target_parameters.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/tcm_usb_gadget.c	patch \|	diff1 \|	diff2 \|	blob \| history