sync with openbsd-current
sync with openbsd-current
sync with openbsd-current
sync with openbsd-current
Merge branch 'master' into hellfish

Resolved by hand.
Conflicts:
	etc/netstart
	games/boggle/boggle/boggle.6
	games/hunt/hunt/hunt.6
	lib/libssl/src/crypto/x509/x509_att.c
	lib/libssl/src/ssl/t1_lib.c
	share/man/man4/Makefile
	sys/dev/pci/sdhc_pci.c
	sys/kern/subr_pool.c
	usr.bin/tmux/tmux.1
Our USB stack contains a hack needed for ehci(4) and ohci(4) that
breaks xhci(4).   The diff below moves this hack in these drivers,
and makes it possible to have a working xhci(4) in GENERIC.

I'd like this diff to be tested on as much machines as possible, because
the code path it touches is very sensible.  This also matters if you are
using uhci(4)!

Please test and report back.

Thanks,
Martin
Merge branch 't-usb-xhci' into hellfish