]> git.proxmox.com Git - qemu.git/commit
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)
commit77f4c9a68aedb9b0d290a1def1bfc8714be862ec
tree1a216049e9f2b8bfe4acf250959ab204fab8cc57
parentd5c5dacc7027af2acfa87f860f11d7791776301f
parent94d1991445fa3582c042ee4e5b72606e2fc39cc2
Merge remote-tracking branch 'origin/master' into staging

* 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
vl.c