Merge branch 'master' into markj-kernel-config
Consolidate DTrace hooks.
Merge branch 'markj-kernel-config' into 20140526-dtrace-trap-hook
Move the DTrace amd64 trap to assembly.
Comment fixes.
Change asm to match what clang emits.
Fix up dtrace_trap for other arches.

Both powerpc and mips have the original bug, I don't plan to fix it.
Merge branch '20140526-dtrace-trap-hook' into markj-develop