Patch merged into coreboot/master: 4f62732 qemu: fix bochs build

the following patch was just integrated into master:
commit 4f62732858ef5d332c6f646c3302b5e7c0f5e436
Author: Gerd Hoffmann 
Date:   Wed Aug 27 10:42:47 2014 +0200

qemu: fix bochs build

commit 9518b56 (intel/gma: Clarify code and use dedicated init for
    Google Peppy) changed "struct edid" and thereby broke the build.
    Adapt drivers/emulation/qemu/bochs.c to the changes to fix this.

Build failure triggers with CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y.

Change-Id: Ic295c6d31284555e1463af5bca673231b8722d54
    Signed-off-by: Gerd Hoffmann 
    Reviewed-on: http://review.coreboot.org/6769
    Tested-by: build bot (Jenkins)
    Reviewed-by: Paul Menzel 
    Reviewed-by: Edward O'Callaghan 
    Reviewed-by: Stefan Reinauer

See http://review.coreboot.org/6769 for details.

-gerrit