summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-05-30 15:02:03 +0800
committerAnthony Liguori <aliguori@us.ibm.com>2012-05-30 15:02:03 +0800
commitd6111501c15972e48b20a60ab0fdd726e84a3ed1 (patch)
tree9a62891981a2f89dd2a73bf58134bf6aad7471d2 /VERSION
parenteba25057b9a5e19d10ace2bc7716667a31297169 (diff)
parent9e2fa418fbe71dd472fe5a9cd89ca26d5b594920 (diff)
downloadqemu-d6111501c15972e48b20a60ab0fdd726e84a3ed1.tar.gz
Merge remote-tracking branch 'mdroth/qga-pull-5-29-12-v2' into staging
* mdroth/qga-pull-5-29-12-v2: qemu-ga: avoid blocking on atime update when reading /etc/mtab qemu-ga: Fix use of environ on Darwin
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions