| commit | fd21e9bba77fbe8516e6f7f2c634372611b942ec | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 23 Aug 2012 21:22:43 +0000 (23 18:22 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 23 Aug 2012 21:22:43 +0000 (23 18:22 -0300) | ||
| tree | 7634979c847e919f5fcc74a7559318687be3d53d | treesnapshot (tar.gz zip) |
| parent | 4144fe9d48c290b390b4e2cdda91fea73036813d | commitdiff |
| parent | 94159135cb59684853dcd45ff70d6dbc54a29209 | commitdiff |
Merge commit '94159135cb59684853dcd45ff70d6dbc54a29209' into upstream-merge
* commit '94159135cb59684853dcd45ff70d6dbc54a29209':
target-mips: Enable access to required RDHWR hardware registers
monitor: move json init from OPEN event to init
boards: add a 'none' machine type to all platforms
Update version for 1.2.0-rc1 release
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '94159135cb59684853dcd45ff70d6dbc54a29209':
target-mips: Enable access to required RDHWR hardware registers
monitor: move json init from OPEN event to init
boards: add a 'none' machine type to all platforms
Update version for 1.2.0-rc1 release
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| hw/Makefile.objs | diff1 | diff2 | blobhistory |
| monitor.c | diff1 | diff2 | blobhistory |