Merge 270872 from head:

  Fix character case in examples for "camcontrol security" - should be
  "-U user" not "-u user".

PR:		193179
Submitted by:	milios ccsys com
Merge r269488 from head:

  For reasons which are not clear, r254263 broke some PCMCIA and CardBus
  bridges in strange ways, either rendering them unable to detect
  insertion and removal events, or possibly unable to read from the
  device behind the bridge.

  This fixes at least one laptop, a Toshiba Tecra M5 with a Texas
  Instruments PCxx12 (d=0x8039 v=0c104c) bridge.  The very similar
  Tecra M9 has the same bridge, but worked fine without this change.

  The bridge chip has no I/O port BAR, and there is nothing in the spec
  to suggest I/O decoding should be enabled; however enabling it fixes
  the issue.  Add an XXX comment to this effect.

Discussed with:		jhb, imp
Merge r269871 from head:

  Clarify descriptions of pthread_cond_wait() and pthread_cond_timedwait()

Submitted by:	Malcolm Douglas via freebsd-doc
Reviewed by:	jhb
Merge r270251 from head:

  Fix return type of callout_init_rm() and add return type to
  callout_deactivate().

PR:		192520
Submitted by:	ngie
Merge r270259 from head:

  Add a missing brace to callout_init_rm() to fix syntax.
Merge r270677 from head:

  Fix xref, pam(8) -> pam(3)

PR:		193045
Submitted by:	rsimmons0 gmail com
Merge r268303 from head:

  Add support to asmc(4) for Macmini 3,1.

PR:		190195
Submitted by:	fbsdbugs2 sentry.org
Relnotes:	yes
MFC	r270844:
Minor space/tab cleanups.

Most of them were ripped from the GSoC 2104
SMAP + kpatch project (but unrelated).
Only cosmetic changes.

Taken from:	Oliver Pinter (op@)
MFC r270289:
Change file permissions for some setuid executables so they are "o+r".
The executable itself doesn't contain any privileged information.

An example of where this is useful is when makefs(8) is creating an image
that includes /sbin/shutdown. This can now be done without root privileges.
Document r259141, jail(8) ipv6 allocation startup bug.

Sponsored by:	The FreeBSD Foundation
Document r264438, mdconfig(8) rc.conf(5) listing is no longer
required to be sequential.

Sponsored by:	The FreeBSD Foundation
Document r262566, sshd(8) startup script creates ed25519 keys
if ENOENT on startup.

Sponsored by:	The FreeBSD Foundation
Merge remote-tracking branch 'freebsd/stable/10' into hardened/10/aslr