Merge commit '2cc6e0a14210d2e80173ec6b4611e7e3c50c2cce' into upstream-merge
[qemu-kvm.git] / target-m68k / machine.c
blobe69de29bb2d1d6434b8b29ae775ad8c2e48c5391