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