Merge commit '8febfa26846e75d38848255028dfe2d06e5ba941' into upstream-merge
commitabe5224ddedc058fc780b0f288d0bb277d514510
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:41:55 +0000 (28 11:41 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:41:55 +0000 (28 11:41 +0000)
treef962fc4f8534fc4bbde643ce8ae260e35039fdee
parent51df62225ded6893e7151e33d1ec7a928fe2c1cb
parent8febfa26846e75d38848255028dfe2d06e5ba941
Merge commit '8febfa26846e75d38848255028dfe2d06e5ba941' into upstream-merge

* commit '8febfa26846e75d38848255028dfe2d06e5ba941':
  Add qemu_aio_process_queue()

Conflicts:
posix-aio-compat.c

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
posix-aio-compat.c