4767 dtrace_probe() always has the timestamp
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Sebastien Roy <sebastien.roy@delphix.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@omniti.com>
3897 zfs filesystem and snapshot limits
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Christopher Siden <christopher.siden@delphix.com>
4745 fix AVL code misspellings
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Robert Mustacchi <rm@joyent.com>
4746 remove EXPORT_SRC leftovers
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Robert Mustacchi <rm@joyent.com>
4747 remove unused [DS]SIZE_LIMIT defines
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Robert Mustacchi <rm@joyent.com>
4748 use an enum for tod_faulted global
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Robert Mustacchi <rm@joyent.com>
	[illumos-gate merge]

commit 4cde9a1e4370decb0ae4451cc85ce57730965c8c
    4748 use an enum for tod_faulted global
commit 9aff5184bfbc5b708bf2ddd810ce726347b52332
    4747 remove unused [DS]SIZE_LIMIT defines
commit 3b082ee621e893f087e4272c7e8b6d512d24e155
    4746 remove EXPORT_SRC leftovers
commit 6907ca4bc759c5fd81b8a60fc5e1a1c7d1972e6a
    4745 fix AVL code misspellings
commit a2afb611b30628fb74ad9eade4ae465f9031e262
    3897 zfs filesystem and snapshot limits
commit 82d86f4e8b1400610e24f161032c16e049f173a0
    4767 dtrace_probe() always has the timestamp

Conflicts:
	usr/src/uts/common/fs/zfs/sys/dsl_dir.h
	usr/src/uts/common/fs/zfs/dsl_dir.c
	usr/src/lib/libzfs/common/libzfs_util.c
	usr/src/lib/libzfs/common/libzfs_dataset.c
	usr/src/common/zfs/zfeature_common.c