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