diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-14 08:44:32 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-14 08:44:32 -0500 |
commit | 77f4c9a68aedb9b0d290a1def1bfc8714be862ec (patch) | |
tree | 1a216049e9f2b8bfe4acf250959ab204fab8cc57 /hw/shix.c | |
parent | d5c5dacc7027af2acfa87f860f11d7791776301f (diff) | |
parent | 94d1991445fa3582c042ee4e5b72606e2fc39cc2 (diff) | |
download | qemu-77f4c9a68aedb9b0d290a1def1bfc8714be862ec.zip |
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
Diffstat (limited to 'hw/shix.c')
0 files changed, 0 insertions, 0 deletions