osdep: add merge and dump flags
authorMichael S. Tsirkin <mst@redhat.com>
Wed, 18 Jun 2014 18:48:19 +0000 (21:48 +0300)
committerMichael S. Tsirkin <mst@redhat.com>
Thu, 19 Jun 2014 15:44:20 +0000 (18:44 +0300)
commit2925020d339d3b53fbb4fb82fbfb32b71f1b41ff
tree52e6392924199ec66f1e9d63365a59f50a19d1af
parent52330e1a96bd09e8570c5694585798982da27adf
osdep: add merge and dump flags

will be used by follow up patch

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
include/qemu/osdep.h