| commit | 85bff8857c62ab2bc3ed204de3fcde74781bbdb2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 18 09:27:20 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 18 09:27:20 2009 -0700 |
| tree | 9d5c8998f4c13f2b9525897ef546559c8fd49cf5 | |
| parent | d941d0ed6bf274ca267dd4de5861ffd24e1ae8f8 [diff] | |
| parent | 76a67ec6fb79ff3570dcb5342142c16098299911 [diff] |
Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux * 'for-2.6.29' of git://linux-nfs.org/~bfields/linux: nfsd: nfsd should drop CAP_MKNOD for non-root NFSD: provide encode routine for OP_OPENATTR