diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:39:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:39:00 +1100 |
| commit | 01bc78be96019b4e1af39f81f26a56d8bd9f7b81 (patch) | |
| tree | ed42e16689058d6d6578bde29f2d342e4e8b68eb /MAINTAINERS | |
| parent | 64342dabeb0042d7de393764dd35e55fca62ac2b (diff) | |
| parent | e3fa3aff0cb198e7c53d894f52146121d9592872 (diff) | |
Merge remote-tracking branch 'net-current/master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8afba6321e24..46015ca5bf2d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2033,7 +2033,7 @@ F: Documentation/scsi/dc395x.txt F: drivers/scsi/dc395x.* DCCP PROTOCOL -M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> +M: Gerrit Renker <gerrit@erg.abdn.ac.uk> L: dccp@vger.kernel.org W: http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp S: Maintained |