| commit | 9f33c188c7ffa2e94727de80897456840eaf2a11 | |
| author | Avi Kivity <avi@redhat.com> | |
| Wed, 26 May 2010 12:07:13 +0000 (26 15:07 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Wed, 26 May 2010 12:07:13 +0000 (26 15:07 +0300) | ||
| tree | ddb6b4bb682bcfc139569214b7d7b3a78a71486a | treesnapshot (tar.gz zip) |
| parent | f551a66bd17701b7b52265e4d274879811c67321 | commitdiff |
| parent | 4556bd8b2514a55d48c15b1adb17537f49657744 | commitdiff |
Merge commit '4556bd8b2514a55d48c15b1adb17537f49657744' into upstream-merge
* commit '4556bd8b2514a55d48c15b1adb17537f49657744':
Compile dma only once
pckbd: improve debugging
Conflicts:
Makefile.target
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '4556bd8b2514a55d48c15b1adb17537f49657744':
Compile dma only once
pckbd: improve debugging
Conflicts:
Makefile.target
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile.objs | diff1 | diff2 | blobhistory |
| Makefile.target | diff1 | diff2 | blobhistory |
| hw/pc.c | diff1 | diff2 | blobhistory |