]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/alon/pull-libcacard.glusterfs' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 12 Feb 2014 17:53:31 +0000 (17:53 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 12 Feb 2014 17:53:31 +0000 (17:53 +0000)
* remotes/alon/pull-libcacard.glusterfs:
  libcacard: Don't link with all libraries QEMU links to

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge