aboutsummaryrefslogtreecommitdiff
path: root/slirp
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-03-22 17:39:48 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-03-22 17:39:48 +0000
commit459621ac1a505ef7dee769295ee2e6c835b2314d (patch)
tree9d1d5f16f8d14ed2eb348fab1baecec0330f5c73 /slirp
parentac0d25e843bdad441db2a26f78898f533bf91bb5 (diff)
parenta284974dee57b5ff7a194cf5daa4026bd22bf5ad (diff)
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-03-21-tag' into staging
qemu-ga patch queue for 2.6 * remove unused variable # gpg: Signature made Mon 21 Mar 2016 17:32:42 GMT using RSA key ID F108B584 # gpg: Good signature from "Michael Roth <flukshun@gmail.com>" # gpg: aka "Michael Roth <mdroth@utexas.edu>" # gpg: aka "Michael Roth <mdroth@linux.vnet.ibm.com>" * remotes/mdroth/tags/qga-pull-2016-03-21-tag: qemu-ga: drop unused local err variable Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp')
0 files changed, 0 insertions, 0 deletions