sync
sync
sync
sync
sync
Merge branch 'master' into bits
Merge branch 'bits' into all2

Conflicts:
	arch/amd64/stand/libsa/biosdev.c
	dev/usb/usbdevs.h
	dev/usb/usbdevs_data.h