tree 1a216049e9f2b8bfe4acf250959ab204fab8cc57
parent d5c5dacc7027af2acfa87f860f11d7791776301f
parent 94d1991445fa3582c042ee4e5b72606e2fc39cc2
author Anthony Liguori <aliguori@us.ibm.com> 1337003072 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1337003072 -0500

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