Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Mar 2009 16:27:20 +0000 (09:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Mar 2009 16:27:20 +0000 (09:27 -0700)
commit85bff8857c62ab2bc3ed204de3fcde74781bbdb2
tree9d5c8998f4c13f2b9525897ef546559c8fd49cf5
parentd941d0ed6bf274ca267dd4de5861ffd24e1ae8f8
parent76a67ec6fb79ff3570dcb5342142c16098299911
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