Fix bcm2835 build, and merge up to illumos-gate

Unfortunately, github makes a proper meal of this.  The two commits you really care about are the bottom two, way down at the bottom of this page that's probably taking 10 damn minutes to load.

Sorry.

I've built and booted to the normal stopping point in qemu