aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Merge "Fix Mac and Windows builds."David 'Digit' Turner2011-05-251-0/+3
|\
| * Fix Mac and Windows builds.David 'Digit' Turner2011-05-261-0/+3
|/
* Merge "x86: kvm: fix KVM build + enable auto-detection."David 'Digit' Turner2011-05-2512-13/+2033
|\
| * x86: kvm: fix KVM build + enable auto-detection.David 'Digit' Turner2011-05-2612-13/+2033
|/
* Merge "fix audio backend handling"David 'Digit' Turner2011-05-241-0/+3
|\
| * fix audio backend handlingDavid 'Digit' Turner2011-05-211-0/+3
* | Reconcile with honeycomb-mr1-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ | |/ |/|
| * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-070-0/+0
| |\
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | |\ | |/ /
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | |\ | |/ /
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-040-0/+0
| | |\
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-030-0/+0
| | | |\
| | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-290-0/+0
| | | | |\
| | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-280-0/+0
| | | | | |\
| | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-270-0/+0
| | | | | | |\
| | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-250-0/+0
| | | | | | | |\
| | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-210-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-190-0/+0
| | | | | | | | | |\ | | | | | | | | |/ /
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-150-0/+0
| | | | | | | | | |\ | | | | | | | | |/ /
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-130-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-070-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-070-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-050-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-040-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-010-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-310-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-280-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | | |/ | | | | | | | | | | |/|
* | | | | | | | | | | | Merge "Add support for xhdpi when injecting a skin dpi into the emulator."David Turner2011-05-172-8/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add support for xhdpi when injecting a skin dpi into the emulator.Xavier Ducrohet2011-05-172-8/+11
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge "Dump hardware config. with -verbose option."David 'Digit' Turner2011-05-164-0/+321
|\ \ \ \ \ \ \ \ \ \ \ \