]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'kraxel/bios.2' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 18 Jul 2012 19:44:32 +0000 (14:44 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 18 Jul 2012 19:44:32 +0000 (14:44 -0500)
commit052bb77a47ce2508538d0e4c9a2fb4b9787a2267
treec0598b15625ce2066f094dab87938f53e7ac3be6
parent83199ca43c81e6931e62e133d9e53024108831ed
parentb45667760753a1fbc956547189a9edd0049630e5
Merge remote-tracking branch 'kraxel/bios.2' into staging

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