]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5c5dac 94d1991)
Merge remote-tracking branch 'origin/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 May 2012 13:44:32 +0000 (08:44 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 May 2012 13:44:32 +0000 (08:44 -0500)
* origin/master:
  sun4u: implement interrupt clearing registers
  sun4u: initialize OBIO interrupt mappings
  fix block loads broken in commit 30038fd818
  Implement address masking for SPARC v9 CPUs
  vga: disable default VGA if appropriate -device is used
  cputlb: fix watchpoints handling

1  2 
vl.c patch | diff1 | diff2 | blob | history

diff --cc vl.c
Simple merge
Qemu copy for testing