]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e02b35 794798e)
Merge remote-tracking branch 'sstabellini/xen-170114' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 31 Jan 2014 00:13:02 +0000 (00:13 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 31 Jan 2014 00:13:02 +0000 (00:13 +0000)
* sstabellini/xen-170114:
  xen_pt: Fix passthrough of device with ROM.
  xen_pt: Fix debug output.
  xenfb: map framebuffer read-only and handle unmap errors

Message-id: alpine.DEB.2.02.1401171537140.21510@kaball.uk.xensource.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge
QEMU mirror