Merge changes Ice960cbe,Icc0d8ee4 * changes: bochs/bios: Fix the mask value used when writing to MTRR_PHYSMASK MSR bochs/bios: Fix build