| commit | 1a4dab849d5d06191ab5e5850f6b8bfcad8ceb47 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Wed, 25 Nov 2015 14:47:06 +0000 (25 14:47 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Wed, 25 Nov 2015 14:47:06 +0000 (25 14:47 +0000) | ||
| tree | 0f557eeb8112d06840c26dab9af56b014ea490a7 | treesnapshot (tar.gz zip) |
| parent | e85dda8070b20dd8765d52daf64de70a9ccf395f | commitdiff |
| parent | 8c34d891b1594840d8394a3c9b92236c13254fd8 | commitdiff |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Wed 25 Nov 2015 13:33:14 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
qemu-iotests: Add -nographic when starting QEMU in 119 and 120
block/qapi: Plug memory leak on query-block error path
raw-posix.c: Make GetBSDPath() handle caching options
nand: fix flash erase when oob is in memory
test-aio: Fix event notifier cleanup
tests/Makefile: Add more dependencies for test-timed-average
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Block layer patches
# gpg: Signature made Wed 25 Nov 2015 13:33:14 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
qemu-iotests: Add -nographic when starting QEMU in 119 and 120
block/qapi: Plug memory leak on query-block error path
raw-posix.c: Make GetBSDPath() handle caching options
nand: fix flash erase when oob is in memory
test-aio: Fix event notifier cleanup
tests/Makefile: Add more dependencies for test-timed-average
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>