aboutsummaryrefslogtreecommitdiff
path: root/error.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-12-19 09:12:25 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-19 09:12:25 -0600
commitcde7fc31dee7a7bac96779f77a21825b187871d3 (patch)
tree2be2b44d2a413f8af70e50a446bec77e3e701d0e /error.c
parent3cfdd0da7e513e740b759a2abec49db3c086d6e2 (diff)
parenta6c5c07990059c94bf50b0422e953af1368353c0 (diff)
downloadqemu-cde7fc31dee7a7bac96779f77a21825b187871d3.zip
qemu-cde7fc31dee7a7bac96779f77a21825b187871d3.tar.gz
qemu-cde7fc31dee7a7bac96779f77a21825b187871d3.tar.bz2
Merge remote-tracking branch 'qemu-kvm/memory/mutators' into staging
Conflicts: memory.h
Diffstat (limited to 'error.c')
0 files changed, 0 insertions, 0 deletions