]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e65fe5 b6f54b3)
Merge remote-tracking branch 'afaerber-or/prep-up' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 6 May 2013 11:49:51 +0000 (06:49 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 6 May 2013 11:49:51 +0000 (06:49 -0500)
# By Andreas Färber (1) and others
# Via Andreas Färber
* afaerber-or/prep-up:
  prep: Make System I/O port 0092 read/write
  prep: Add ELF support for -bios
  prep: Fix NIP reset value


Trivial merge
Qemu copy for testing