diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 16:36:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 16:36:17 -0500 |
| commit | 2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde (patch) | |
| tree | afcc572acff2548cdabdfb0ec488508e1864daf1 /MAINTAINERS | |
| parent | 23afc5c67588c92a062b4828a97b119755dffb51 (diff) | |
| parent | 78f5815368837ae7e3a0d3709c9f95f74e4d8537 (diff) | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6:
MAINTAINERS: update the NFS CLIENT entry
NFS: Fix an Oops in NFS unmount
Revert "NFS: Ensure we return zero if applications attempt to write zero bytes"
SUNRPC xprtrdma: fix XDR tail buf marshalling for all ops
NFSv2/v3: Fix a memory leak when using -onolock
NFS: Fix NFS mountpoint crossing...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a7caced39bfa..cdc2198db754 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2751,8 +2751,10 @@ S: Maintained | |||
| 2751 | 2751 | ||
| 2752 | NFS CLIENT | 2752 | NFS CLIENT |
| 2753 | P: Trond Myklebust | 2753 | P: Trond Myklebust |
| 2754 | M: trond.myklebust@fys.uio.no | 2754 | M: Trond.Myklebust@netapp.com |
| 2755 | L: linux-kernel@vger.kernel.org | 2755 | L: linux-nfs@vger.kernel.org |
| 2756 | W: http://client.linux-nfs.org | ||
| 2757 | T: git git://git.linux-nfs.org/pub/linux/nfs-2.6.git | ||
| 2756 | S: Maintained | 2758 | S: Maintained |
| 2757 | 2759 | ||
| 2758 | NI5010 NETWORK DRIVER | 2760 | NI5010 NETWORK DRIVER |