aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * upstream integrationDavid 'Digit' Turner2011-06-01160-11611/+12672
| |\ |/ /
| * trace.h: rename to trace-android.hDavid 'Digit' Turner2011-06-0112-213/+217
| * target-arm/translate.c: move Android-specific stuff out.David 'Digit' Turner2011-06-017-260/+304
| * tcg: integrate upstream versionDavid 'Digit' Turner2011-06-0124-2206/+4356
| * ramblocks: integrate upstream implementation (sophisticated)David 'Digit' Turner2011-06-0118-823/+449
| * vl-android.c: move arch-specific functions to arch_init.cDavid 'Digit' Turner2011-06-016-400/+777
| * vl-android.c: move cpu functions to cpus.cDavid 'Digit' Turner2011-06-015-1386/+675
| * vl-android.c: use os-specific setup routinesDavid 'Digit' Turner2011-06-013-565/+32
| * compatfd.c: minor integrateDavid 'Digit' Turner2011-06-012-60/+64
| * cpu-exec.c: minor integrateDavid 'Digit' Turner2011-06-011-14/+39
| * qemu-char-android.c: rename to qemu-char.cDavid 'Digit' Turner2011-06-018-2585/+183
| * cpu_restore_state: remove un-necessary argument.David 'Digit' Turner2011-06-016-72/+66
| * qjson.c: minor integrateDavid 'Digit' Turner2011-06-012-12/+51
| * vl-android.c: Move code to iohandler.cDavid 'Digit' Turner2011-06-015-217/+215
| * translate-all.c: minor integrateDavid 'Digit' Turner2011-06-015-13/+6
| * qemu-config.c: minor integrateDavid 'Digit' Turner2011-06-012-1/+120
| * monitor.c: minor integrateDavid 'Digit' Turner2011-06-012-9/+12
| * disas.c: minor integrateDavid 'Digit' Turner2011-06-012-18/+14
| * device_tree.c: minor integrateDavid 'Digit' Turner2011-06-012-3/+2
| * bswap.h + others: minor integrateDavid 'Digit' Turner2011-06-014-3/+16
| * buffered_file.c: minor integrateDavid 'Digit' Turner2011-06-011-1/+0
| * savevm: Remove OutputBuffer hack.David 'Digit' Turner2011-06-0110-211/+147
| * savevm.c: minor integrateDavid 'Digit' Turner2011-06-013-108/+167
| * arm-semi.c: minor integrateDavid 'Digit' Turner2011-06-011-31/+49
| * README: minor integrateDavid 'Digit' Turner2011-06-011-22/+2
| * trace: simplify code and avoid conflictsDavid 'Digit' Turner2011-06-017-471/+103
| * acl.c: minor integrateDavid 'Digit' Turner2011-06-011-1/+0
| * arm-dis.c: minor integrateDavid 'Digit' Turner2011-06-012-58/+76
| * fpu: upstream integrateDavid 'Digit' Turner2011-06-016-791/+1888
| * json-lexer.c, json-parser.c: minor integrateDavid 'Digit' Turner2011-06-012-8/+5
| * trace.h: minor C compatibility fixes.David 'Digit' Turner2011-06-011-3/+3
| * qemu-char.h, console.h: upstream integrationDavid 'Digit' Turner2011-06-019-125/+409
| * qemu-timer.c: rename qemu_timer_new_scale()David 'Digit' Turner2011-06-0127-150/+130
| * qemu-timer.c: upstream integrateDavid 'Digit' Turner2011-06-017-195/+463
| * qerror: minor integrateDavid 'Digit' Turner2011-06-012-5/+24
| * qemu-error: minor integrateDavid 'Digit' Turner2011-06-016-28/+25
| * posix-aio-compat.c: minor integrateDavid 'Digit' Turner2011-06-011-2/+10
| * os-posix.c + os-win32.c and dependenciesDavid 'Digit' Turner2011-06-0115-272/+1063
| * qemu-common.h: other intergratesDavid 'Digit' Turner2011-06-017-283/+346
| * integrate: qemu-common.h changesDavid 'Digit' Turner2011-06-0113-138/+316
|/
* Merge "vl-android.c: Fix PC Bios search order."David 'Digit' Turner2011-06-011-46/+30
|\
| * vl-android.c: Fix PC Bios search order.David 'Digit' Turner2011-06-011-46/+30
|/
* Merge "android-rebuild.sh: Better parallel builds."David 'Digit' Turner2011-06-011-3/+17
|\
| * android-rebuild.sh: Better parallel builds.David 'Digit' Turner2011-06-011-3/+17
* | Merge "android-configure.sh: fix KVM-enabled builds."David 'Digit' Turner2011-06-011-1/+16
|\ \ | |/
| * android-configure.sh: fix KVM-enabled builds.David 'Digit' Turner2011-06-011-1/+16
|/
* Merge "kvm: Fix KVM auto-detection"David 'Digit' Turner2011-05-311-28/+2
|\
| * kvm: Fix KVM auto-detectionDavid 'Digit' Turner2011-05-301-28/+2
|/
* Merge "x86: Workaorund for the KVM GS_BASE MSR save/restore issue."David Turner2011-05-307-1/+182
|\
| * x86: Workaorund for the KVM GS_BASE MSR save/restore issue.Jun Nakajima2011-05-277-1/+182
|/