MFC r274549:

Make it possible to do "iscsictl -Rt xxx -p yyy", to remove a session
that matches both -t and -p.

Sponsored by:	The FreeBSD Foundation
MFC r274621:

The "intr" option is NFS-specific; fix examples in auto_master(5).

Sponsored by:	The FreeBSD Foundation
MFC r274723:

Make the auto_master(5) man page clearer on how auto_master
and map files work together, and add example for smbfs.

Sponsored by:	The FreeBSD Foundation
MFC r273482,r274078:

r273482:

  The NetBSD libc tests use several definitions/macros that aren't available in
  FreeBSD

  Add the missing compat definitions/macros to lib/libnetbsd so the testcases
  can be compiled with libnetbsd without having to invent ad hoc #define's, or
  having to convert things over to FreeBSD idioms

  Reviewed by: brooks
  Phabric: D993
  Sponsored by: EMC / Isilon Storage Division

r274078:

  Commit missing header for sys/time.h compat on NetBSD to unbreak the amd64/i386
  build

  Pointyhat to: me (forgot to svn add it sooner)
MFC r274796:

Document use of wildcards (*) and ampersands (&) in autofs map files.

Sponsored by:	The FreeBSD Foundation