]> git.decadent.org.uk Git - nfs-utils.git/commit
Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:59:02 +0000 (02:59 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:59:02 +0000 (02:59 +0100)
commit64996d13e704699d6065538876cc146cb68f849b
tree58062d010330be4afb40fcbfe9f2a36e6b901b18
parent9438b647be378ec0f578697b613de723e02312a2
parentb2e71e2c8d888d9775a34da03afc5d18ada06c61
Merge branch 'upstream'

Conflicts:
Makefile.in
aclocal.m4
configure
depcomp
install-sh
linux-nfs/Makefile.in
missing
support/Makefile.in
support/export/Makefile.in
support/include/Makefile.in
support/include/nfs/Makefile.in
support/include/rpcsvc/Makefile.in
support/include/sys/Makefile.in
support/include/sys/fs/Makefile.in
support/misc/Makefile.in
support/nfs/Makefile.in
tools/Makefile.in
tools/locktest/Makefile.in
tools/nlmtest/Makefile.in
tools/rpcdebug/Makefile.in
tools/rpcgen/Makefile.in
utils/Makefile.in
utils/exportfs/Makefile.in
utils/gssd/Makefile.in
utils/idmapd/Makefile.in
utils/mount/Makefile.in
utils/mountd/Makefile.in
utils/nfsd/Makefile.in
utils/nfsstat/Makefile.in
utils/showmount/Makefile.in
utils/statd/Makefile.in