Merge remote-tracking branch 'sstabellini/xen-170114' into staging
commit97374ce538883af677fd94803b71df2d55a9a4de
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 31 Jan 2014 00:13:02 +0000 (31 00:13 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 31 Jan 2014 00:13:02 +0000 (31 00:13 +0000)
tree886e1d89b827d2f059cf184ac4a99cd8d00dc18e
parent8e02b359267f8919de799525a4ccd4d37ef2d127
parent794798e36eda77802ce7cc7d7d6b1c65751e8a76
Merge remote-tracking branch 'sstabellini/xen-170114' into staging

* 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>