# HG changeset patch
# User enricop <enricop@computer.org>
# Date 1369809084 -7200
# Node ID 1d129c71b62805ccf1af48bb05771f6657a61d09
# Parent  17d182b692ec1042d168356d0757df41075b5934# Parent  63225a03be3fe84bdd4c78db9413999a14d983a2
Merged illumos/illumos-gate into default

diff -r 17d182b692ec -r 1d129c71b628 usr/src/uts/common/nfs/nfs4_clnt.h
--- a/usr/src/uts/common/nfs/nfs4_clnt.h	Wed May 29 08:30:04 2013 +0200
+++ b/usr/src/uts/common/nfs/nfs4_clnt.h	Wed May 29 08:31:24 2013 +0200
@@ -464,7 +464,7 @@
 			{0x6c6f7374, 0x206f7065, 0x6e202020}},	\
 		{TAG_OPENATTR,		"openattr",		\
 			{0x6f70656e, 0x61747472, 0x20202020}},	\
-		{TAG_PATHCONF,		"pathhconf",		\
+		{TAG_PATHCONF,		"pathconf",		\
 			{0x70617468, 0x636f6e66, 0x20202020}},	\
 		{TAG_PUTROOTFH,		"putrootfh",		\
 			{0x70757472, 0x6f6f7466, 0x68202020}},	\