projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d941d0e 76a67ec)
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)
* '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


Trivial merge