aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-03-03 21:16:48 -0500
committerDavid S. Miller <davem@davemloft.net>2015-03-03 21:16:48 -0500
commit71a83a6db6138b9d41d8a0b6b91cb59f6dc4742c (patch)
treef74b6e4e48257ec6ce40b95645ecb8533b9cc1f8 /MAINTAINERS
parentb97526f3ff95f92b107f0fb52cbb8627e395429b (diff)
parenta6c5170d1edea97c538c81e377e56c7b5c5b7e63 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS30
1 files changed, 21 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 274a0058f3f2..a6ae6eb0c545 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2065,7 +2065,7 @@ F: include/net/bluetooth/
2065BONDING DRIVER 2065BONDING DRIVER
2066M: Jay Vosburgh <j.vosburgh@gmail.com> 2066M: Jay Vosburgh <j.vosburgh@gmail.com>
2067M: Veaceslav Falico <vfalico@gmail.com> 2067M: Veaceslav Falico <vfalico@gmail.com>
2068M: Andy Gospodarek <andy@greyhouse.net> 2068M: Andy Gospodarek <gospo@cumulusnetworks.com>
2069L: netdev@vger.kernel.org 2069L: netdev@vger.kernel.org
2070W: http://sourceforge.net/projects/bonding/ 2070W: http://sourceforge.net/projects/bonding/
2071S: Supported 2071S: Supported
@@ -2433,7 +2433,8 @@ F: arch/powerpc/oprofile/*cell*
2433F: arch/powerpc/platforms/cell/ 2433F: arch/powerpc/platforms/cell/
2434 2434
2435CEPH DISTRIBUTED FILE SYSTEM CLIENT 2435CEPH DISTRIBUTED FILE SYSTEM CLIENT
2436M: Sage Weil <sage@inktank.com> 2436M: Yan, Zheng <zyan@redhat.com>
2437M: Sage Weil <sage@redhat.com>
2437L: ceph-devel@vger.kernel.org 2438L: ceph-devel@vger.kernel.org
2438W: http://ceph.com/ 2439W: http://ceph.com/
2439T: git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git 2440T: git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
@@ -3936,7 +3937,7 @@ S: Maintained
3936F: drivers/staging/fbtft/ 3937F: drivers/staging/fbtft/
3937 3938
3938FCOE SUBSYSTEM (libfc, libfcoe, fcoe) 3939FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
3939M: Robert Love <robert.w.love@intel.com> 3940M: Vasu Dev <vasu.dev@intel.com>
3940L: fcoe-devel@open-fcoe.org 3941L: fcoe-devel@open-fcoe.org
3941W: www.Open-FCoE.org 3942W: www.Open-FCoE.org
3942S: Supported 3943S: Supported
@@ -4092,6 +4093,12 @@ S: Maintained
4092F: include/linux/platform_data/video-imxfb.h 4093F: include/linux/platform_data/video-imxfb.h
4093F: drivers/video/fbdev/imxfb.c 4094F: drivers/video/fbdev/imxfb.c
4094 4095
4096FREESCALE QUAD SPI DRIVER
4097M: Han Xu <han.xu@freescale.com>
4098L: linux-mtd@lists.infradead.org
4099S: Maintained
4100F: drivers/mtd/spi-nor/fsl-quadspi.c
4101
4095FREESCALE SOC FS_ENET DRIVER 4102FREESCALE SOC FS_ENET DRIVER
4096M: Pantelis Antoniou <pantelis.antoniou@gmail.com> 4103M: Pantelis Antoniou <pantelis.antoniou@gmail.com>
4097M: Vitaly Bordug <vbordug@ru.mvista.com> 4104M: Vitaly Bordug <vbordug@ru.mvista.com>
@@ -7206,8 +7213,7 @@ ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
7206M: Mark Fasheh <mfasheh@suse.com> 7213M: Mark Fasheh <mfasheh@suse.com>
7207M: Joel Becker <jlbec@evilplan.org> 7214M: Joel Becker <jlbec@evilplan.org>
7208L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers) 7215L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
7209W: http://oss.oracle.com/projects/ocfs2/ 7216W: http://ocfs2.wiki.kernel.org
7210T: git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git
7211S: Supported 7217S: Supported
7212F: Documentation/filesystems/ocfs2.txt 7218F: Documentation/filesystems/ocfs2.txt
7213F: Documentation/filesystems/dlmfs.txt 7219F: Documentation/filesystems/dlmfs.txt
@@ -7296,7 +7302,7 @@ M: Alok Kataria <akataria@vmware.com>
7296M: Rusty Russell <rusty@rustcorp.com.au> 7302M: Rusty Russell <rusty@rustcorp.com.au>
7297L: virtualization@lists.linux-foundation.org 7303L: virtualization@lists.linux-foundation.org
7298S: Supported 7304S: Supported
7299F: Documentation/ia64/paravirt_ops.txt 7305F: Documentation/virtual/paravirt_ops.txt
7300F: arch/*/kernel/paravirt* 7306F: arch/*/kernel/paravirt*
7301F: arch/*/include/asm/paravirt.h 7307F: arch/*/include/asm/paravirt.h
7302 7308
@@ -7992,8 +7998,8 @@ S: Supported
7992F: drivers/net/wireless/ath/wcn36xx/ 7998F: drivers/net/wireless/ath/wcn36xx/
7993 7999
7994RADOS BLOCK DEVICE (RBD) 8000RADOS BLOCK DEVICE (RBD)
7995M: Yehuda Sadeh <yehuda@inktank.com> 8001M: Ilya Dryomov <idryomov@gmail.com>
7996M: Sage Weil <sage@inktank.com> 8002M: Sage Weil <sage@redhat.com>
7997M: Alex Elder <elder@kernel.org> 8003M: Alex Elder <elder@kernel.org>
7998M: ceph-devel@vger.kernel.org 8004M: ceph-devel@vger.kernel.org
7999W: http://ceph.com/ 8005W: http://ceph.com/
@@ -8496,6 +8502,7 @@ SYNOPSYS DESIGNWARE DMAC DRIVER
8496M: Viresh Kumar <viresh.linux@gmail.com> 8502M: Viresh Kumar <viresh.linux@gmail.com>
8497M: Andy Shevchenko <andriy.shevchenko@linux.intel.com> 8503M: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
8498S: Maintained 8504S: Maintained
8505F: include/linux/dma/dw.h
8499F: include/linux/platform_data/dma-dw.h 8506F: include/linux/platform_data/dma-dw.h
8500F: drivers/dma/dw/ 8507F: drivers/dma/dw/
8501 8508
@@ -8558,7 +8565,7 @@ S: Maintained
8558F: drivers/scsi/sr* 8565F: drivers/scsi/sr*
8559 8566
8560SCSI RDMA PROTOCOL (SRP) INITIATOR 8567SCSI RDMA PROTOCOL (SRP) INITIATOR
8561M: Bart Van Assche <bvanassche@acm.org> 8568M: Bart Van Assche <bart.vanassche@sandisk.com>
8562L: linux-rdma@vger.kernel.org 8569L: linux-rdma@vger.kernel.org
8563S: Supported 8570S: Supported
8564W: http://www.openfabrics.org 8571W: http://www.openfabrics.org
@@ -9710,6 +9717,11 @@ L: linux-omap@vger.kernel.org
9710S: Maintained 9717S: Maintained
9711F: drivers/thermal/ti-soc-thermal/ 9718F: drivers/thermal/ti-soc-thermal/
9712 9719
9720TI CDCE706 CLOCK DRIVER
9721M: Max Filippov <jcmvbkbc@gmail.com>
9722S: Maintained
9723F: drivers/clk/clk-cdce706.c
9724
9713TI CLOCK DRIVER 9725TI CLOCK DRIVER
9714M: Tero Kristo <t-kristo@ti.com> 9726M: Tero Kristo <t-kristo@ti.com>
9715L: linux-omap@vger.kernel.org 9727L: linux-omap@vger.kernel.org
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-31 00:11:19 -0400