Merge tag 'fcoe' into fixes

author James Bottomley <[email protected]>

Thu, 27 Jun 2013 06:07:53 +0000 (23:07 -0700)

committer James Bottomley <[email protected]>

Thu, 27 Jun 2013 06:07:53 +0000 (23:07 -0700)
author James Bottomley <[email protected]>
Thu, 27 Jun 2013 06:07:53 +0000 (23:07 -0700)
committer James Bottomley <[email protected]>
Thu, 27 Jun 2013 06:07:53 +0000 (23:07 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/scsi/fcoe/fcoe_ctlr.c
Simple merge
author	James Bottomley <[email protected]>
	Thu, 27 Jun 2013 06:07:53 +0000 (23:07 -0700)
committer	James Bottomley <[email protected]>
	Thu, 27 Jun 2013 06:07:53 +0000 (23:07 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe_ctlr.c	patch \|	diff1 \|	diff2 \|	blob \| history