Merge remote-tracking branch 'remotes/sstabellini/xen-2015-01-26' into staging
commit074092d074f7a55378659223cf54ca06f6d0fbde
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 26 Jan 2015 13:11:16 +0000 (26 13:11 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 26 Jan 2015 13:11:16 +0000 (26 13:11 +0000)
treeff42391a4f74498c5cd3330a8d0900a65e284f76
parent0c28d0d07fbcd7aa44d231241d444d00882256e2
parentd01a5a3fe19645f3cdea1566f0e518ea2152a029
Merge remote-tracking branch 'remotes/sstabellini/xen-2015-01-26' into staging

* remotes/sstabellini/xen-2015-01-26:
  fix QEMU build on Xen/ARM

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>