Merge remote-tracking branch 'remotes/sstabellini/xen-2015-01-26' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 26 Jan 2015 13:11:16 +0000 (13:11 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 26 Jan 2015 13:11:16 +0000 (13:11 +0000)
* remotes/sstabellini/xen-2015-01-26:
  fix QEMU build on Xen/ARM

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

Trivial merge