From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 14 May 2012 13:44:32 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into staging
X-Git-Tag: v1.1-rc2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77f4c9a68aedb9b0d290a1def1bfc8714be862ec;p=thirdparty%2Fqemu.git

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
---

77f4c9a68aedb9b0d290a1def1bfc8714be862ec