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

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

Fri, 9 Nov 2012 01:10:43 +0000 (12:10 +1100)

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

Fri, 9 Nov 2012 01:10:43 +0000 (12:10 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Nov 2012 01:10:43 +0000 (12:10 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Nov 2012 01:10:43 +0000 (12:10 +1100)
diff --cc drivers/md/md.c
Simple merge
diff --cc drivers/md/raid5.c
Simple merge
diff --cc drivers/scsi/qla2xxx/qla_target.c
Simple merge
diff --cc drivers/scsi/qla2xxx/tcm_qla2xxx.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Nov 2012 01:10:43 +0000 (12:10 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Nov 2012 01:10:43 +0000 (12:10 +1100)
		1	2
drivers/md/md.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_target.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/tcm_qla2xxx.c	patch \|	diff1 \|	diff2 \|	blob \| history