Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-20160621-1' into staging
[sdk/emulator/qemu.git] / contrib /
drwxr-xr-x   ..
drwxr-xr-x - ivshmem-client
drwxr-xr-x - ivshmem-server