From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 26 Mar 2012 20:08:15 +0000 (-0500)
Subject: Merge remote-tracking branch 'spice/spice.v51' into staging
X-Git-Tag: qemu-xen-4.3.0-rc1~1322
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3d032f0f5a7968e1721dd6eca00b61ee84510411;p=qemu-upstream-unstable.git

Merge remote-tracking branch 'spice/spice.v51' into staging

* spice/spice.v51:
  ui/spice-display: use uintptr_t when casting qxl physical addresses
  ui/spice-display.c: Fix compilation warnings on 32 bit hosts
---

3d032f0f5a7968e1721dd6eca00b61ee84510411