diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-10-24 10:26:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-10-24 10:26:44 +0100 |
| commit | 4387f5671f9676336c87b68f5e87ba54fbea3714 (patch) | |
| tree | a0cf4005a503f0c8120d645cc028ec74f1a8fc5c /hw/isa/pc87312.c | |
| parent | b49e452fe994f8fbcd22bf5a87b79a2355481318 (diff) | |
| parent | 35132016dc1c27de2b1354b161df6cc22f3ac5bf (diff) | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20161021-tag' into staging
Xen 2016/10/21
# gpg: Signature made Fri 21 Oct 2016 20:52:42 BST
# gpg: using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <sstabellini@kernel.org>"
# gpg: aka "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90
* remotes/sstabellini/tags/xen-20161021-tag:
xen_platform: SUSE xenlinux unplug for emulated PCI
xen_platform: unplug also SCSI disks
xen-usb: do not reference PAGE_SIZE
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/isa/pc87312.c')
0 files changed, 0 insertions, 0 deletions