]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge remote-tracking branch 'mdroth/qga-pull-3-26-12' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Mar 2012 20:17:51 +0000 (15:17 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Mar 2012 20:17:51 +0000 (15:17 -0500)
* mdroth/qga-pull-3-26-12:
  qemu-ga: fix bsd build, and re-org linux-specific implementations


Trivial merge