Merge Gabe and my changes to arch/mips/utility.hh