the bitrig sync20160316 branch has been updated by marco with 1 new commit:
commit c569e5732c1bbb4e0974e6652ab7db6ececa0a9a diff: https://github.com/bitrig/bitrig/commit/c569e57 author: Marco Peereboom <[email protected]> date: Wed Mar 9 17:14:12 2016 -0600 mismerge M sys/arch/amd64/include/conf.h
