Merge tag 'fcoe1' into fixes
James Bottomley [Thu, 27 Jun 2013 06:08:22 +0000 (23:08 -0700)]
This patch fixes a critical bug that was introduced in 3.9
related to VLAN tagging FCoE frames.

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge