Merge remote-tracking branch 'rth/tags/pull-axp-20161117' into staging
[sdk/emulator/qemu.git] / contrib /
drwxr-xr-x   ..
drwxr-xr-x - ivshmem-client
drwxr-xr-x - ivshmem-server