From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 18 Jul 2012 19:44:32 +0000 (-0500)
Subject: Merge remote-tracking branch 'kraxel/bios.2' into staging
X-Git-Tag: v1.2.0-rc0~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=052bb77a47ce2508538d0e4c9a2fb4b9787a2267;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'kraxel/bios.2' into staging

* kraxel/bios.2:
  Add vgabios build rules to roms/Makefile
---

052bb77a47ce2508538d0e4c9a2fb4b9787a2267