diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-05 17:03:07 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-05 17:03:07 +0100 |
| commit | 76eb75be79b52a3c6ae1fd840083fa1a04458c1c (patch) | |
| tree | bb90a570be2b1f521913b6233e11bae841608ad0 /MAINTAINERS | |
| parent | packet: fix panic in __packet_set_timestamp on tpacket_v3 in tx mode (diff) | |
| parent | Merge tag 'xfs-for-linus-4.10-rc3' of git://git.kernel.org/pub/scm/fs/xfs/xfs... (diff) | |
| download | linux-76eb75be79b52a3c6ae1fd840083fa1a04458c1c.tar.xz linux-76eb75be79b52a3c6ae1fd840083fa1a04458c1c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 11904a95672a..fcb33a17831a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5086,9 +5086,11 @@ F: drivers/net/wan/dlci.c F: drivers/net/wan/sdla.c FRAMEBUFFER LAYER +M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> L: linux-fbdev@vger.kernel.org +T: git git://github.com/bzolnier/linux.git Q: http://patchwork.kernel.org/project/linux-fbdev/list/ -S: Orphan +S: Maintained F: Documentation/fb/ F: drivers/video/ F: include/video/ @@ -8858,17 +8860,22 @@ F: drivers/video/fbdev/nvidia/ NVM EXPRESS DRIVER M: Keith Busch <keith.busch@intel.com> M: Jens Axboe <axboe@fb.com> +M: Christoph Hellwig <hch@lst.de> +M: Sagi Grimberg <sagi@grimberg.me> L: linux-nvme@lists.infradead.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git -W: https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/ +T: git://git.infradead.org/nvme.git +W: http://git.infradead.org/nvme.git S: Supported F: drivers/nvme/host/ F: include/linux/nvme.h +F: include/uapi/linux/nvme_ioctl.h NVM EXPRESS TARGET DRIVER M: Christoph Hellwig <hch@lst.de> M: Sagi Grimberg <sagi@grimberg.me> L: linux-nvme@lists.infradead.org +T: git://git.infradead.org/nvme.git +W: http://git.infradead.org/nvme.git S: Supported F: drivers/nvme/target/ @@ -13533,11 +13540,11 @@ F: arch/x86/xen/*swiotlb* F: drivers/xen/*swiotlb* XFS FILESYSTEM -M: Dave Chinner <david@fromorbit.com> +M: Darrick J. Wong <darrick.wong@oracle.com> M: linux-xfs@vger.kernel.org L: linux-xfs@vger.kernel.org W: http://xfs.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git +T: git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git S: Supported F: Documentation/filesystems/xfs.txt F: fs/xfs/ |