]> www.infradead.org Git - users/dwmw2/qemu.git/commit
projects / users / dwmw2 / qemu.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 880b1ff 997eba2)
Merge remote-tracking branch 'origin/master' into HEAD
authorMichael S. Tsirkin <mst@redhat.com>
Thu, 11 Jan 2018 20:01:17 +0000 (22:01 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Thu, 11 Jan 2018 20:03:50 +0000 (22:03 +0200)
commitacc95bc85036c443da8bf7159a77edf9f00dcd80
tree21965c6e60a2e29664b7685e52feacdb6a86e0bdtree
parent880b1ffe6ec2f0ae25cc4175716227ad275e8b8acommit | diff
parent997eba28a3ed5400a80f754bf3a1c8044b75b9ffcommit | diff
Merge remote-tracking branch 'origin/master' into HEAD

Resolve conflicts around apb.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
hw/i2c/pm_smbus.c diff1 | diff2 | blob | history
hw/i386/xen/xen_platform.c diff1 | diff2 | blob | history
hw/pci-bridge/pci_expander_bridge.c diff1 | diff2 | blob | history
hw/pci-host/apb.c diff1 | diff2 | blob | history
hw/pci-host/ppce500.c diff1 | diff2 | blob | history
hw/ppc/spapr_pci.c diff1 | diff2 | blob | history
hw/xen/xen_pt.c diff1 | diff2 | blob | history
include/hw/qdev-properties.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.