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