Merge remote-tracking branch 'remotes/sstabellini/xen-2015-01-13' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 13 Jan 2015 18:32:42 +0000 (18:32 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 13 Jan 2015 18:32:42 +0000 (18:32 +0000)
commit3a7f560fa612610822727f7647ed6bc10bccd6ec
tree78a897864685c195660b181f1fe8249a028d190e
parenta00369fc565cef32076b767ecff34469642afe06
parentc1d322e6048796296555dd36fdd102d7fa2f50bf
Merge remote-tracking branch 'remotes/sstabellini/xen-2015-01-13' into staging

* remotes/sstabellini/xen-2015-01-13:
  xen-hvm: increase maxmem before calling xc_domain_populate_physmap
  xen-pt: Fix PCI devices re-attach failed

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