Merge branch 'master' into markj-kernel-config
Fix ident for my kernel config.
Merge branch 'master' into markj-kernel-config
Add vlan(4) and lagg(4), plus some cleanup.
Merge branch 'markj-kernel-config' into markj-develop

Conflicts:
	sys/amd64/conf/MARKJ