[illumos-gate merge]

commit ba00d94ad32aec378c65c2bad5cd13dd9145041a
    10121 smatch fix for auditstat
commit 07e71bcf7552a80dff82c5f2b62d9d3a65c488b2
    10391 SPARC build of libficl-sys fails after 10338
commit a6422048521434dc250a1832c980645e5de26b4e
    9287 dladm Segmentation Fault (core dumped) on unknown field
commit 9426efbbd0cbf49bc29df076259d21faff4226a9
    10370 sunmdi: cast between incompatible function types
commit f2c063acc68609f8132d5b735f167b1213cf5380
    10359 terminfo: add underline for sun-color
commit 954fa1e90ed4bd3992f7c431c152b972a1845034
    10365 modconf: cast between incompatible function types
commit 4dfd3a951f98bde88f1fe577490f5403db4db9d6
    10363 rpcmod: this statement may fall through
commit f06e090ade385ba43b3b86dc2dea1960ad49e8e4
    10356 uts/common/io/tem: do not copy common line tails
commit 54811da5ac6b517992fdc173df5d605e4e61fdc0
    8423 Implement large_dnode pool feature
    8199 multi-threaded dmu_object_alloc()
    7432 Large dnode pool feature
commit 856f710c9dc323b39da5935194d7928ffb99b67f
    10361 usr/lib - stop lint library generation and packaging

	Conflicts:
	usr/src/uts/common/fs/zfs/dbuf.c

1 files changed, 0 insertions, 59 deletions

diff --git a/usr/src/lib/libresolv2/common/llib-lresolv b/usr/src/lib/libresolv2/common/llib-lresolv
deleted file mode 100644
index aedd06a0fa..0000000000
--- a/usr/src/lib/libresolv2/common/llib-lresolv
+++ /dev/null
@@ -1,59 +0,0 @@
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * Copyright (c) 1997-1999 by Sun Microsystems, Inc. 
- * All rights reserved. 
- */ 
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
-/*
- * usr/src/lib/libresolv2 routines
- */
-
-int		dn_skipname(const uchar_t *, const uchar_t *);
-void		fp_query(const u_char *, FILE *);
-const uchar_t *	p_cdname(const uchar_t *, const uchar_t *, FILE *);
-const char *	p_class(int);
-void		p_query(const u_char *);
-const char *	p_time(unsigned int);
-const char *	p_type(int);
-void		putlong(unsigned int, uchar_t *);
-uint32_t	_getlong(const u_char *);
-uint16_t	_getshort(const u_char *);
-const char *	hstrerror(int);
-int		res_init(void);
-int		res_mkquery(int, const char *, int, int, const u_char *,
-				int, const u_char *, u_char *, int);
-int		res_query(const char *, int, int, u_char *, int);
-int		res_querydomain(const char *, const char *, int, int,
-				u_char *, int);
-int		res_search(const char *, int, int, u_char *, int);
-int		res_send(const u_char *, int, u_char *, int);
-int		res_update(ns_updrec *);
-int		res_ninit(res_state);
-void		fp_resstat(const res_state, FILE *);
-const char *	res_hostalias(const res_state, const char *, char *, size_t);
-int		res_nquery(res_state, const char *, int, int, u_char *, int);
-int		res_nsearch(res_state, const char *, int, int, u_char *, int);
-int		res_nquerydomain(res_state, const char *, const char *,
-				int, int, u_char *, int);
-int		res_nmkquery(res_state, int, const char *, int, int,
-				const u_char *, int, const u_char *,
-				u_char *, int);
-int		res_nsend(res_state, const u_char *, int, u_char *, int);
-int		res_nmkupdate(res_state, ns_updrec *, u_char *, int);
-void		res_nclose(res_state);
-int		res_nsendsigned(res_state, const u_char *, int, ns_tsig_key *,
-				u_char *, int);
-int		dn_comp(const char *, u_char *, int, u_char **, u_char **);
-int		dn_expand(const u_char *, const u_char *, const u_char *,
-				char *, int);