Move mergeinfo to the right place.

Approved by:	re (gjb)
MFH (r256338): store some entropy after installation

Approved by:	re (gjb)
In sys/dev/bxe/bxe.c, print bus_addr_t values using %#jx, to fix several
gcc warnings for PAE kernels.

Approved by:	re (glebius)
Reviewed by:	davidch, edavis