diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3f591629e953..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 |
@@ -1637,9 +1636,8 @@ S: Maintained | |||
1637 | F: sound/pci/cs5535audio/ | 1636 | F: sound/pci/cs5535audio/ |
1638 | 1637 | ||
1639 | CX18 VIDEO4LINUX DRIVER | 1638 | CX18 VIDEO4LINUX DRIVER |
1640 | M: Hans Verkuil <hverkuil@xs4all.nl> | ||
1641 | M: Andy Walls <awalls@radix.net> | 1639 | M: Andy Walls <awalls@radix.net> |
1642 | L: ivtv-devel@ivtvdriver.org | 1640 | L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) |
1643 | L: linux-media@vger.kernel.org | 1641 | L: linux-media@vger.kernel.org |
1644 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git | 1642 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git |
1645 | W: http://linuxtv.org | 1643 | W: http://linuxtv.org |
@@ -1824,7 +1822,6 @@ S: Supported | |||
1824 | F: fs/dlm/ | 1822 | F: fs/dlm/ |
1825 | 1823 | ||
1826 | DMA GENERIC OFFLOAD ENGINE SUBSYSTEM | 1824 | DMA GENERIC OFFLOAD ENGINE SUBSYSTEM |
1827 | M: Maciej Sosnowski <maciej.sosnowski@intel.com> | ||
1828 | M: Dan Williams <dan.j.williams@intel.com> | 1825 | M: Dan Williams <dan.j.williams@intel.com> |
1829 | S: Supported | 1826 | S: Supported |
1830 | F: drivers/dma/ | 1827 | F: drivers/dma/ |
@@ -2787,7 +2784,7 @@ F: arch/x86/kernel/microcode_core.c | |||
2787 | F: arch/x86/kernel/microcode_intel.c | 2784 | F: arch/x86/kernel/microcode_intel.c |
2788 | 2785 | ||
2789 | INTEL I/OAT DMA DRIVER | 2786 | INTEL I/OAT DMA DRIVER |
2790 | M: Maciej Sosnowski <maciej.sosnowski@intel.com> | 2787 | M: Dan Williams <dan.j.williams@intel.com> |
2791 | S: Supported | 2788 | S: Supported |
2792 | F: drivers/dma/ioat* | 2789 | F: drivers/dma/ioat* |
2793 | 2790 | ||
@@ -2825,10 +2822,11 @@ L: netdev@vger.kernel.org | |||
2825 | S: Maintained | 2822 | S: Maintained |
2826 | F: drivers/net/ixp2000/ | 2823 | F: drivers/net/ixp2000/ |
2827 | 2824 | ||
2828 | INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe) | 2825 | INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe) |
2829 | M: Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2826 | M: Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
2830 | M: Jesse Brandeburg <jesse.brandeburg@intel.com> | 2827 | M: Jesse Brandeburg <jesse.brandeburg@intel.com> |
2831 | 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> | ||
2832 | M: PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com> | 2830 | M: PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com> |
2833 | M: John Ronciak <john.ronciak@intel.com> | 2831 | M: John Ronciak <john.ronciak@intel.com> |
2834 | L: e1000-devel@lists.sourceforge.net | 2832 | L: e1000-devel@lists.sourceforge.net |
@@ -2838,6 +2836,7 @@ F: drivers/net/e100.c | |||
2838 | F: drivers/net/e1000/ | 2836 | F: drivers/net/e1000/ |
2839 | F: drivers/net/e1000e/ | 2837 | F: drivers/net/e1000e/ |
2840 | F: drivers/net/igb/ | 2838 | F: drivers/net/igb/ |
2839 | F: drivers/net/igbvf/ | ||
2841 | F: drivers/net/ixgb/ | 2840 | F: drivers/net/ixgb/ |
2842 | F: drivers/net/ixgbe/ | 2841 | F: drivers/net/ixgbe/ |
2843 | 2842 | ||
@@ -3011,8 +3010,8 @@ S: Maintained | |||
3011 | F: drivers/isdn/hardware/eicon/ | 3010 | F: drivers/isdn/hardware/eicon/ |
3012 | 3011 | ||
3013 | IVTV VIDEO4LINUX DRIVER | 3012 | IVTV VIDEO4LINUX DRIVER |
3014 | M: Hans Verkuil <hverkuil@xs4all.nl> | 3013 | M: Andy Walls <awalls@radix.net> |
3015 | L: ivtv-devel@ivtvdriver.org | 3014 | L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) |
3016 | L: linux-media@vger.kernel.org | 3015 | L: linux-media@vger.kernel.org |
3017 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git | 3016 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git |
3018 | W: http://www.ivtvdriver.org | 3017 | W: http://www.ivtvdriver.org |