Merge tag 'fcoe' into fixes
James Bottomley [Thu, 27 Jun 2013 06:07:53 +0000 (23:07 -0700)]
3.10 fixes

1  2 
MAINTAINERS
drivers/scsi/fcoe/fcoe_ctlr.c

diff --cc MAINTAINERS
Simple merge
Simple merge