| commit | 2e88035e52dee6b6efac71fbd1432ed1c117eab8 | |
| author | Avi Kivity <avi@redhat.com> | |
| Wed, 2 Dec 2009 10:48:32 +0000 (2 12:48 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Wed, 2 Dec 2009 10:48:32 +0000 (2 12:48 +0200) | ||
| tree | 943ab9665347abb29fdf6eb3a47205f4adbb3a2f | treesnapshot (tar.gz zip) |
| parent | 328bb4286d8f952930215b11734aaad4764574cf | commitdiff |
| parent | b0293e54af32bcf08f4b4e5b4b472534de343972 | commitdiff |
Merge commit 'b0293e54af32bcf08f4b4e5b4b472534de343972' into upstream-merge
* commit 'b0293e54af32bcf08f4b4e5b4b472534de343972':
Update SeaBIOS
ARM atomic ops rewrite
ARM RealView I2C
GPIO I2C rework
DS1338 RTC
BCD cleanup
Makefile dependencies for device configs
target-mips: fix physical address type in MMU functions
[WIN32] Enable -k option on Windows too
target-mips: make CP0_LLAddr register CPU dependent
target-mips: rename CP0_LLAddr into lladdr
Conflicts:
pc-bios/bios.bin (pick upstream's)
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'b0293e54af32bcf08f4b4e5b4b472534de343972':
Update SeaBIOS
ARM atomic ops rewrite
ARM RealView I2C
GPIO I2C rework
DS1338 RTC
BCD cleanup
Makefile dependencies for device configs
target-mips: fix physical address type in MMU functions
[WIN32] Enable -k option on Windows too
target-mips: make CP0_LLAddr register CPU dependent
target-mips: rename CP0_LLAddr into lladdr
Conflicts:
pc-bios/bios.bin (pick upstream's)
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile | diff1 | diff2 | blobhistory |
| Makefile.target | diff1 | diff2 | blobhistory |
| configure | diff1 | diff2 | blobhistory |
| qemu-common.h | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |