aboutsummaryrefslogtreecommitdiff
path: root/target-alpha
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2012-07-29 17:03:19 +0300
committerMichael S. Tsirkin <mst@redhat.com>2012-07-29 17:05:35 +0300
commit5e59b024351f827f903f98ae522687ea53dc4f23 (patch)
tree4996f31e1d7d9e08c04d8bbf018752a71c6cd4c3 /target-alpha
parent7162ab21fe8e82f924002951cd8e87f69358f8b5 (diff)
parent932d4a42afa28829fadf3cbfbb0507cc09aafd8b (diff)
Merge branch pci into master
Merge master and pci branch, resolve build breakage in hw/esp.c introduced by f90c2bcd. Conflicts: hw/esp.c
Diffstat (limited to 'target-alpha')
0 files changed, 0 insertions, 0 deletions