OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b87dcdd
2f01dfa
)
Merge remote-tracking branch 'remotes/sstabellini/xen-2014-11-14' into staging
author
Peter Maydell
<peter.maydell@linaro.org>
Fri, 14 Nov 2014 12:05:33 +0000
(12:05 +0000)
committer
Peter Maydell
<peter.maydell@linaro.org>
Fri, 14 Nov 2014 12:05:33 +0000
(12:05 +0000)
* remotes/sstabellini/xen-2014-11-14:
xen_disk: fix unmapping of persistent grants
pc: piix4_pm: init legacy PCI hotplug when running on Xen
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Trivial merge