| commit | 339f99d49455817c5e4dd8d01fa4296d603ff5ff | |
| author | yajin <yajin@vm-kernel.org> | |
| Sat, 10 Jan 2009 20:59:44 +0000 (11 04:59 +0800) | ||
| committer | yajin <yajin@vm-kernel.org> | |
| Sat, 10 Jan 2009 20:59:44 +0000 (11 04:59 +0800) | ||
| tree | 5b637d11f267478dcd711ece6ceb4aa7d89a095a | treesnapshot (tar.gz zip) |
| parent | c873e7d10433175ff615b5ad79a4fa1a8c8499aa | commitdiff |
| parent | f420f01197555f307181bd6fa7cf6148b566c4f2 | commitdiff |
Merge commit 'qemu-jz/master' into jz
Conflicts:
hw/mips_jz.c
hw/mips_jz.h
hw/mips_jz_clk.c
hw/mips_pavo.c
Conflicts:
hw/mips_jz.c
hw/mips_jz.h
hw/mips_jz_clk.c
hw/mips_pavo.c
| .gitignore | diff1 | diff2 | blobhistory |
| hw/mips_jz.c | diff1 | diff2 | blobhistory |
| hw/mips_jz.h | diff1 | diff2 | blobhistory |
| hw/mips_jz_clk.c | diff1 | diff2 | blobhistory |
| hw/mips_pavo.c | diff1 | diff2 | blobhistory |