]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'mdroth/qga-pull-5-29-12-v2' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 30 May 2012 07:02:03 +0000 (15:02 +0800)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 30 May 2012 07:02:03 +0000 (15:02 +0800)
* 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


Trivial merge