From: Linus Torvalds Date: Wed, 16 Dec 2009 18:43:34 +0000 (-0800) Subject: Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=37c24b37fb2454e95136139d10bb6828967105bf;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux * 'for-2.6.33' of git://linux-nfs.org/~bfields/linux: (42 commits) nfsd: remove pointless paths in file headers nfsd: move most of nfsfh.h to fs/nfsd nfsd: remove unused field rq_reffh nfsd: enable V4ROOT exports nfsd: make V4ROOT exports read-only nfsd: restrict filehandles accepted in V4ROOT case nfsd: allow exports of symlinks nfsd: filter readdir results in V4ROOT case nfsd: filter lookup results in V4ROOT case nfsd4: don't continue "under" mounts in V4ROOT case nfsd: introduce export flag for v4 pseudoroot nfsd: let "insecure" flag vary by pseudoflavor nfsd: new interface to advertise export features nfsd: Move private headers to source directory vfs: nfsctl.c un-used nfsd #includes lockd: Remove un-used nfsd headers #includes s390: remove un-used nfsd #includes sparc: remove un-used nfsd #includes parsic: remove un-used nfsd #includes compat.c: Remove dependence on nfsd private headers ... --- 37c24b37fb2454e95136139d10bb6828967105bf