From: Linus Torvalds Date: Wed, 18 Mar 2009 16:27:20 +0000 (-0700) Subject: Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=85bff8857c62ab2bc3ed204de3fcde74781bbdb2;p=linux-2.6-omap-h63xx.git 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 --- 85bff8857c62ab2bc3ed204de3fcde74781bbdb2