diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-03 11:40:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-03 11:40:30 +1100 |
| commit | 385526216fd0d7f715b642b6f1c16cd9422f24cd (patch) | |
| tree | 941f38fa375dd4a591e341c5a36e8bfd7f408835 /MAINTAINERS | |
| parent | e913c8a193df55c1fbbc676e77e989d21dd70783 (diff) | |
| parent | 5f8127b8db66e8b0aa6d9c0136c708c8ad6bb45c (diff) | |
Merge remote-tracking branch 'block/for-next'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6b17d8661e7e..7eccfdd0df63 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8644,10 +8644,10 @@ S: Maintained F: drivers/net/ethernet/netronome/ NETWORK BLOCK DEVICE (NBD) -M: Markus Pargmann <mpa@pengutronix.de> +M: Josef Bacik <jbacik@fb.com> S: Maintained +L: linux-block@vger.kernel.org L: nbd-general@lists.sourceforge.net -T: git git://git.pengutronix.de/git/mpa/linux-nbd.git F: Documentation/blockdev/nbd.txt F: drivers/block/nbd.c F: include/uapi/linux/nbd.h |