Merge branch 'master' into blambert.pipe-lock-fix
Merge branch 'master' into brad.sparcfillramdisk
Merge branch 'master' into deraadt.ipw-resume
Merge branch 'master' into gbe.scheduler_improvements
Merge branch 'master' into kettenis.1650panicfix
Merge branch 'master' into kettenis.msi_enable_i386
Merge branch 'master' into kettenis.uhcidmasync
Merge branch 'master' into luis.henriques.ath-5424
Merge branch 'master' into shadchin.fritztest
Merge branch 'master' into stsp.srconcatboot

Conflicts:
	arch/amd64/stand/libsa/biosdev.c
committed upstream, backout any local changes
Merge branch 'master' into tedu.disksort
Merge branch 'master' into thib.fixassertwaitok
Merge branch 'master' into todd.enablebluetooth
Merge branch 'master' into todd.enablempath
Merge branch 'master' into todd.fixnoauxreg
Merge branch 'master' into todd.nfsprivport
Merge branch 'master' into todd.nfsrealignfix
Merge branch 'master' into todd.noapm
Merge branch 'master' into todd.sis