aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1858646b52e3..03f38c18f323 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -987,7 +987,6 @@ F: drivers/platform/x86/asus-laptop.c
987 987
988ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API 988ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
989M: Dan Williams <dan.j.williams@intel.com> 989M: Dan Williams <dan.j.williams@intel.com>
990M: Maciej Sosnowski <maciej.sosnowski@intel.com>
991W: http://sourceforge.net/projects/xscaleiop 990W: http://sourceforge.net/projects/xscaleiop
992S: Supported 991S: Supported
993F: Documentation/crypto/async-tx-api.txt 992F: Documentation/crypto/async-tx-api.txt
@@ -1823,7 +1822,6 @@ S: Supported
1823F: fs/dlm/ 1822F: fs/dlm/
1824 1823
1825DMA GENERIC OFFLOAD ENGINE SUBSYSTEM 1824DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
1826M: Maciej Sosnowski <maciej.sosnowski@intel.com>
1827M: Dan Williams <dan.j.williams@intel.com> 1825M: Dan Williams <dan.j.williams@intel.com>
1828S: Supported 1826S: Supported
1829F: drivers/dma/ 1827F: drivers/dma/
@@ -2786,7 +2784,7 @@ F: arch/x86/kernel/microcode_core.c
2786F: arch/x86/kernel/microcode_intel.c 2784F: arch/x86/kernel/microcode_intel.c
2787 2785
2788INTEL I/OAT DMA DRIVER 2786INTEL I/OAT DMA DRIVER
2789M: Maciej Sosnowski <maciej.sosnowski@intel.com> 2787M: Dan Williams <dan.j.williams@intel.com>
2790S: Supported 2788S: Supported
2791F: drivers/dma/ioat* 2789F: drivers/dma/ioat*
2792 2790
@@ -2824,10 +2822,11 @@ L: netdev@vger.kernel.org
2824S: Maintained 2822S: Maintained
2825F: drivers/net/ixp2000/ 2823F: drivers/net/ixp2000/
2826 2824
2827INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe) 2825INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe)
2828M: Jeff Kirsher <jeffrey.t.kirsher@intel.com> 2826M: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
2829M: Jesse Brandeburg <jesse.brandeburg@intel.com> 2827M: Jesse Brandeburg <jesse.brandeburg@intel.com>
2830M: Bruce Allan <bruce.w.allan@intel.com> 2828M: Bruce Allan <bruce.w.allan@intel.com>
2829M: Alex Duyck <alexander.h.duyck@intel.com>
2831M: PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com> 2830M: PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
2832M: John Ronciak <john.ronciak@intel.com> 2831M: John Ronciak <john.ronciak@intel.com>
2833L: e1000-devel@lists.sourceforge.net 2832L: e1000-devel@lists.sourceforge.net
@@ -2837,6 +2836,7 @@ F: drivers/net/e100.c
2837F: drivers/net/e1000/ 2836F: drivers/net/e1000/
2838F: drivers/net/e1000e/ 2837F: drivers/net/e1000e/
2839F: drivers/net/igb/ 2838F: drivers/net/igb/
2839F: drivers/net/igbvf/
2840F: drivers/net/ixgb/ 2840F: drivers/net/ixgb/
2841F: drivers/net/ixgbe/ 2841F: drivers/net/ixgbe/
2842 2842