diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-01 23:01:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-01 23:01:28 -0500 |
| commit | 8e769788b31438ceb245960a72bec8ed51eb04b2 (patch) | |
| tree | ee753140216282d113b2bcf578ad9166f0eec375 /MAINTAINERS | |
| parent | 8169d10cd9c584e9287005384998ac2e88ec5250 (diff) | |
| parent | 90327e7dffca439e277aa2eb113d07b838e03644 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates
This series implements the Linux Virtual Function (VF) driver for
the Intel Ethernet Controller XL710 family.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0d58ff5d2a6..23bd3c2ee6e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4451,7 +4451,7 @@ M: Deepak Saxena <dsaxena@plexity.net> S: Maintained F: drivers/char/hw_random/ixp4xx-rng.c -INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e) +INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf) M: Jeff Kirsher <jeffrey.t.kirsher@intel.com> M: Jesse Brandeburg <jesse.brandeburg@intel.com> M: Bruce Allan <bruce.w.allan@intel.com> @@ -4460,6 +4460,7 @@ M: Don Skidmore <donald.c.skidmore@intel.com> M: Greg Rose <gregory.v.rose@intel.com> M: Alex Duyck <alexander.h.duyck@intel.com> M: John Ronciak <john.ronciak@intel.com> +M: Mitch Williams <mitch.a.williams@intel.com> L: e1000-devel@lists.sourceforge.net W: http://www.intel.com/support/feedback.htm W: http://e1000.sourceforge.net/ @@ -4475,6 +4476,7 @@ F: Documentation/networking/ixgb.txt F: Documentation/networking/ixgbe.txt F: Documentation/networking/ixgbevf.txt F: Documentation/networking/i40e.txt +F: Documentation/networking/i40evf.txt F: drivers/net/ethernet/intel/ INTEL-MID GPIO DRIVER |