Merge branch 'will_pci-bios32_20140714-gem5'