History log of /openbmc/qemu/pc-bios/openbios-sparc32 (Results 276 – 300 of 340)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v1.4.0-rc1, qemu-kvm-0.12.1.2-2.356.el6, v1.4.0-rc0, v1.3.1, RHEL-6.4, qemu-kvm-0.12.1.2-2.355.el6, qemu-kvm-0.12.1.2-2.353.el6, qemu-kvm-0.12.1.2-2.352.el6
# 63e3555e 10-Jan-2013 Andreas Färber <andreas.faerber@web.de>

Merge branch 'master' of git://git.qemu.org/qemu into prep-up

Conflicts:
hw/Makefile.objs
hw/ppc_prep.c

Signed-off-by: Andreas Färber <andreas.faerber@web.de>


Revision tags: qemu-kvm-0.12.1.2-2.351.el6, qemu-kvm-0.12.1.2-2.350.el6, qemu-1.4-vfio-20130109.0, qemu-kvm-0.12.1.2-2.349.el6, qemu-kvm-0.12.1.2-2.348.el6, qemu-kvm-0.12.1.2-2.347.el6, qemu-kvm-0.12.1.2-2.295.el6_3.10, v1.2.2, qemu-kvm-0.12.1.2-2.295.el6_3.9, qemu-kvm-0.12.1.2-2.344.el6, qemu-kvm-0.12.1.2-2.343.el6, vfio-pci-for-qemu-20121210.0, qemu-kvm-0.12.1.2-2.342.el6, qemu-kvm-0.12.1.2-2.340.el6, v1.3.0, qemu-kvm-0.12.1.2-2.339.el6, qemu-kvm-0.12.1.2-2.338.el6, v1.3.0-rc2, v1.3.0-rc1, qemu-kvm-0.12.1.2-2.337.el6, qemu-kvm-0.12.1.2-2.336.el6, v1.3.0-rc0, qemu-kvm-0.12.1.2-2.335.el6, qemu-kvm-0.12.1.2-2.295.el6_3.8, vfio-pci-for-qemu-1.3.0-rc0, qemu-kvm-0.12.1.2-2.295.el6_3.7, qemu-kvm-0.12.1.2-2.295.el6_3.6, qemu-kvm-0.12.1.2-2.334.el6, qemu-kvm-0.12.1.2-2.333.el6, qemu-kvm-0.12.1.2-2.332.el6, qemu-kvm-0.12.1.2-2.331.el6, qemu-kvm-0.12.1.2-2.295.el6_3.5, qemu-kvm-0.12.1.2-2.330.el6, qemu-kvm-0.12.1.2-2.329.el6, vfio-pci-for-qemu-20121017.0, qemu-kvm-0.12.1.2-2.328.el6, qemu-kvm-0.12.1.2-2.295.el6_3.4, qemu-kvm-0.12.1.2-2.327.el6, qemu-kvm-0.12.1.2-2.326.el6, qemu-kvm-0.12.1.2-2.325.el6, qemu-kvm-0.12.1.2-2.324.el6, qemu-kvm-0.12.1.2-2.323.el6, v1.2.1, qemu-kvm-0.12.1.2-2.295.el6_3.3, qemu-kvm-0.12.1.2-2.322.el6.fixed, qemu-kvm-0.12.1.2-2.321.el6.fixed, qemu-kvm-0.12.1.2-2.322.el6, qemu-kvm-0.12.1.2-2.321.el6, vfio-pci-for-qemu-20121008.0, vfio-pci-for-qemu-20121005.0, vfio-pci-for-qemu-20121004.0, qemu-kvm-0.12.1.2-2.319.el6, qemu-kvm-0.12.1.2-2.318.el6, qemu-kvm-0.12.1.2-2.317.el6, vfio-pci-for-qemu-v6, vfio-pci-for-qemu-v5-resend, qemu-kvm-0.12.1.2-2.315.el6, qemu-kvm-0.12.1.2-2.314.el6, vfio-pci-for-qemu-v5, vfio-pci-for-qemu-v4, qemu-kvm-0.12.1.2-2.313.el6, qemu-kvm-1.1.2, qemu-kvm-0.12.1.2-2.312.el6, qemu-kvm-1.2.0, v1.1.2, v1.2.0, qemu-kvm-0.12.1.2-2.311.el6, qemu-kvm-0.12.1.2-2.310.el6, qemu-kvm-0.12.1.2-2.295.el6_3.2, qemu-kvm-0.12.1.2-2.309.el6, v1.2.0-rc3, qemu-kvm-1.2.0-rc2, v1.2.0-rc2, qemu-kvm-0.12.1.2-2.308.el6, qemu-kvm-1.2.0-rc1, v1.2.0-rc1
# a9b670b1 22-Aug-2012 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'bonzini/scsi-next' into staging

* bonzini/scsi-next:
virtio-scsi: add backwards-compatibility properties for 1.1 and earlier machines
iscsi: fix rac

Merge remote-tracking branch 'bonzini/scsi-next' into staging

* bonzini/scsi-next:
virtio-scsi: add backwards-compatibility properties for 1.1 and earlier machines
iscsi: fix races between task completion and abort
iscsi: simplify iscsi_schedule_bh
iscsi: move iscsi_schedule_bh and iscsi_readv_writev_bh_cb
Revert "iscsi: Fix NULL dereferences / races between task completion and abort"

show more ...


# 7b2f89c4 22-Aug-2012 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony:
virtio-blk: hide VIRTIO_BLK_F_CONFIG_WCE from old machine types
Documentation: Warn against qem

Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony:
virtio-blk: hide VIRTIO_BLK_F_CONFIG_WCE from old machine types
Documentation: Warn against qemu-img on active image
vmdk: Read footer for streamOptimized images
vmdk: Fix header structure

Conflicts:
hw/virtio-blk.c

show more ...


# b6825cd7 22-Aug-2012 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'kraxel/usb.59' into staging

* kraxel/usb.59:
ehci: Fix setting of halt bit from usbcmd register updates
ehci: fix Interrupt Threshold Control implem

Merge remote-tracking branch 'kraxel/usb.59' into staging

* kraxel/usb.59:
ehci: Fix setting of halt bit from usbcmd register updates
ehci: fix Interrupt Threshold Control implementation
usb: update uas product id
usb: async control xfer fixup

show more ...


Revision tags: qemu-kvm-0.12.1.2-2.307.el6, qemu-kvm-0.12.1.2-2.306.el6
# 682527c0 19-Aug-2012 Blue Swirl <blauwirbel@gmail.com>

Update OpenBIOS images

Update OpenBIOS images to SVN r1062. Build with GCC 4.6.0
in order to avoid boot problems introduced by GCC 4.7.[01].

Signed-off-by: Blue Swirl <blauwirbe

Update OpenBIOS images

Update OpenBIOS images to SVN r1062. Build with GCC 4.6.0
in order to avoid boot problems introduced by GCC 4.7.[01].

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

show more ...


Revision tags: v1.2.0-rc0, qemu-kvm-0.12.1.2-2.305.el6, vfio-pci-for-qemu-1.2-v3, qemu-kvm-0.12.1.2-2.304.el6, qemu-kvm-0.12.1.2-2.303.el6, vfio-pci-for-qemu-1.2-v2, qemu-kvm-0.12.1.2-2.302.el6, vfio-pci-for-qemu-1.2, qemu-kvm-0.12.1.2-2.301.el6, qemu-kvm-0.12.1.2-2.300.el6, qemu-kvm-0.12.1.2-2.299.el6, qemu-kvm-0.12.1.2-2.298.el6, qemu-kvm-0.12.1.2-2.297.el6, qemu-kvm-0.12.1.2-2.295.el6_3.1, qemu-kvm-0.12.1.2-2.296.el6, qemu-kvm-1.1.1, v1.1.1, qemu-kvm-1.1.0
# 74f4d227 02-Jun-2012 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

* qemu-kvm/uq/master:
virtio/vhost: Add support for KVM in-kernel MSI injection
msix: Add msix_nr_vectors_allocated

Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

* qemu-kvm/uq/master:
virtio/vhost: Add support for KVM in-kernel MSI injection
msix: Add msix_nr_vectors_allocated
kvm: Enable use of kvm_irqchip_in_kernel in hwlib code
kvm: Introduce kvm_irqchip_add/remove_irqfd
kvm: Make kvm_irqchip_commit_routes an internal service
kvm: Publicize kvm_irqchip_release_virq
kvm: Introduce kvm_irqchip_add_msi_route
kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route
msix: Introduce vector notifiers
msix: Invoke msix_handle_mask_update on msix_mask_all
msix: Factor out msix_get_message
kvm: update vmxcap for EPT A/D, INVPCID, RDRAND, VMFUNC
kvm: Enable in-kernel irqchip support by default
kvm: Add support for direct MSI injections
kvm: Update kernel headers
kvm: x86: Wire up MSI support for in-kernel irqchip
pc: Enable MSI support at APIC level
kvm: Introduce basic MSI support for in-kernel irqchips
Introduce MSIMessage structure
kvm: Refactor KVMState::max_gsi to gsi_count

show more ...


# 2eb02f28 02-Jun-2012 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony:
ahci: SATA FIS is 20 bytes, not 0x20
virtio-blk: Fix geometry sector calculation
block: p

Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony:
ahci: SATA FIS is 20 bytes, not 0x20
virtio-blk: Fix geometry sector calculation
block: prevent snapshot mode $TMPDIR symlink attack
sheepdog: fix return value of do_load_save_vm_state
virtio: Fix compiler warning for non Linux hosts

show more ...


Revision tags: v1.1.0, qemu-kvm-1.1-rc4, v1.1.0-rc4
# 272d28ec 30-May-2012 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'origin/master' into staging

* origin/master:
pc-bios: Update OpenBIOS images


# 6f129261 30-May-2012 Blue Swirl <blauwirbel@gmail.com>

pc-bios: Update OpenBIOS images

Update OpenBIOS images to r1060 built from submodule.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>


Revision tags: qemu-kvm-1.1-rc3, v1.1.0-rc3, RHEL-6.3, qemu-kvm-0.12.1.2-2.295.el6, RHEL-6.3-Snapshot-4, qemu-kvm-0.12.1.2-2.294.el6, qemu-kvm-1.1-rc2, qemu-kvm-0.12.1.2-2.293.el6, v1.1-rc2, v1.1.0-rc2, v1.1-rc1, RHEL-6.3-Snapshot-3, qemu-kvm-0.12.1.2-2.292.el6, qemu-kvm-0.12.1.2-2.291.el6, v1.1-rc0, RHEL-6.3-Snapshot-2, qemu-kvm-0.12.1.2-2.290.el6, qemu-kvm-0.12.1.2-2.289.el6
# 725cbc68 01-May-2012 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

* stefanha/trivial-patches:
iohandler: Use bool for boolean struct member and remove holes
async: Use bool fo

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

* stefanha/trivial-patches:
iohandler: Use bool for boolean struct member and remove holes
async: Use bool for boolean struct members and remove a hole
configure: Fix creation of symbolic links for MinGW toolchain

show more ...


# 75e4e847 01-May-2012 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'mdroth/qga-pull-4-27-12' into staging

* mdroth/qga-pull-4-27-12:
qemu-ga: persist tracking of fsfreeze state via filesystem
qemu-ga: add a whitelist

Merge remote-tracking branch 'mdroth/qga-pull-4-27-12' into staging

* mdroth/qga-pull-4-27-12:
qemu-ga: persist tracking of fsfreeze state via filesystem
qemu-ga: add a whitelist for fsfreeze-safe commands
qemu-ga: improve recovery options for fsfreeze

show more ...


# 7d21dcc8 01-May-2012 Blue Swirl <blauwirbel@gmail.com>

pc-bios: update OpenBIOS images

Update OpenBIOS images to SVN r1056.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>


Revision tags: qemu-kvm-0.12.1.2-2.288.el6, qemu-kvm-0.12.1.2-2.287.el6, RHEL-6.3-Snapshot-1, qemu-kvm-0.12.1.2-2.286.el6, qemu-kvm-0.12.1.2-2.285.el6, qemu-kvm-0.12.1.2-2.284.el6, qemu-kvm-0.12.1.2-2.283.el6, qemu-kvm-0.12.1.2-2.282.el6, qemu-kvm-0.12.1.2-2.281.el6, qemu-kvm-0.12.1.2-2.280.el6, qemu-kvm-0.12.1.2-2.279.el6, qemu-kvm-0.12.1.2-2.209.el6_2.5, qemu-kvm-0.12.1.2-2.278.el6, qemu-kvm-0.12.1.2-2.277.el6, qemu-kvm-1.0.1, qemu-kvm-0.12.1.2-2.276.el6, qemu-kvm-0.12.1.2-2.275.el6, qemu-kvm-0.12.1.2-2.274.el6, qemu-kvm-0.12.1.2-2.273.el6, RHEL-6.3-Beta-1, qemu-kvm-0.12.1.2-2.272.el6, qemu-kvm-0.12.1.2-2.270.el6, qemu-kvm-0.12.1.2-2.269.el6, qemu-kvm-0.12.1.2-2.268.el6, qemu-kvm-0.12.1.2-2.267.el6, qemu-kvm-0.12.1.2-2.266.el6, RHEL-6.3-Alpha-1, RHEL-6.3-Alpha-2, qemu-kvm-0.12.1.2-2.265.el6, qemu-kvm-0.12.1.2-2.264.el6, qemu-kvm-0.12.1.2-2.263.el6, qemu-kvm-0.12.1.2-2.261.el6, qemu-kvm-0.12.1.2-2.260.el6, qemu-kvm-0.12.1.2-2.259.el6, qemu-kvm-0.12.1.2-2.258.el6, qemu-kvm-0.12.1.2-2.257.el6, qemu-kvm-0.12.1.2-2.256.el6, qemu-kvm-0.12.1.2-2.255.el6, qemu-kvm-0.12.1.2-2.254.el6, qemu-kvm-0.12.1.2-2.253.el6, qemu-kvm-0.12.1.2-2.251.el6, qemu-kvm-0.12.1.2-2.250.el6, qemu-kvm-0.12.1.2-2.249.el6, qemu-kvm-0.12.1.2-2.248.el6, qemu-kvm-0.12.1.2-2.247.el6, qemu-kvm-0.12.1.2-2.246.el6, qemu-kvm-0.12.1.2-2.245.el6, qemu-kvm-0.12.1.2-2.244.el6, qemu-kvm-0.12.1.2-2.243.el6, qemu-kvm-0.12.1.2-2.242.el6, qemu-kvm-0.12.1.2-2.241.el6, qemu-kvm-0.12.1.2-2.240.el6, qemu-kvm-0.12.1.2-2.239.el6, qemu-kvm-0.12.1.2-2.238.el6, qemu-kvm-0.12.1.2-2.237.el6, qemu-kvm-0.12.1.2-2.236.el6, qemu-kvm-0.12.1.2-2.235.el6, qemu-kvm-0.12.1.2-2.234.el6, qemu-kvm-0.12.1.2-2.233.el6
# d06cddf5 23-Feb-2012 Kevin Wolf <kwolf@redhat.com>

Merge qemu-iotests into for-anthony


Revision tags: qemu-kvm-0.12.1.2-2.232.el6, qemu-kvm-0.12.1.2-2.231.el6, qemu-kvm-0.12.1.2-2.230.el6, qemu-kvm-0.12.1.2-2.229.el6, qemu-kvm-0.12.1.2-2.228.el6, qemu-kvm-0.12.1.2-2.227.el6, qemu-kvm-0.12.1.2-2.226.el6, qemu-kvm-0.12.1.2-2.225.el6, qemu-kvm-0.12.1.2-2.224.el6, qemu-kvm-0.12.1.2-2.223.el6, v1.0.1, qemu-kvm-0.12.1.2-2.222.el6, qemu-kvm-0.12.1.2-2.221.el6, qemu-kvm-0.12.1.2-2.220.el6, qemu-kvm-0.12.1.2-2.219.el6, qemu-kvm-0.12.1.2-2.209.el6_2.4, qemu-kvm-0.12.1.2-2.218.el6, qemu-kvm-0.12.1.2-2.217.el6, qemu-kvm-0.12.1.2-2.209.el6_2.3, qemu-kvm-0.12.1.2-2.216.el6, qemu-kvm-0.12.1.2-2.215.el6, qemu-kvm-0.12.1.2-2.214.el6, qemu-kvm-0.12.1.2-2.213.el6, qemu-kvm-0.12.1.2-2.212.el6, qemu-kvm-0.12.1.2-2.209.el6_2.2, qemu-kvm-0.12.1.2-2.211.el6, qemu-kvm-1.0, v1.0, v1.0-rc4, qemu-kvm-0.12.1.2-2.210.el6, v1.0-rc3, qemu-kvm-0.12.1.2-2.209.el6_2.1, v1.0-rc2, qemu-kvm-0.12.1.2-2.160.el6_1.9, v1.0-rc1, RHEL-6.2, qemu-kvm-0.12.1.2-2.209.el6, v1.0-rc0, qemu-kvm-0.12.1.2-2.208.el6, qemu-kvm-0.12.1.2-2.207.el6, qemu-kvm-0.12.1.2-2.206.el6, qemu-kvm-0.12.1.2-2.205.el6, qemu-kvm-0.12.1.2-2.204.el6, qemu-kvm-0.12.1.2-2.203.el6, qemu-kvm-0.12.1.2-2.202.el6, qemu-kvm-0.12.1.2-2.201.el6, qemu-kvm-0.12.1.2-2.200.el6, qemu-kvm-0.15.1, qemu-kvm-0.12.1.2-2.199.el6, qemu-kvm-0.12.1.2-2.198.el6, qemu-kvm-0.12.1.2-2.197.el6, v0.15.1, qemu-kvm-0.12.1.2-2.196.el6, qemu-kvm-0.12.1.2-2.195.el6, qemu-kvm-0.12.1.2-2.194.el6
# 8f440cda 29-Sep-2011 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'kiszka/queues/slirp' into staging


# 62ec6073 29-Sep-2011 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'aneesh/for-upstream-5' into staging


Revision tags: qemu-kvm-0.12.1.2-2.193.el6, qemu-kvm-0.12.1.2-2.192.el6, qemu-kvm-0.12.1.2-2.191.el6, qemu-kvm-0.12.1.2-2.190.el6, qemu-kvm-0.12.1.2-2.189.el6, qemu-kvm-0.12.1.2-2.188.el6, qemu-kvm-0.12.1.2-2.187.el6, qemu-kvm-0.12.1.2-2.186.el6
# 0bce98df 29-Aug-2011 Blue Swirl <blauwirbel@gmail.com>

Add OpenBIOS as a submodule

Update OpenBIOS images to r1047 built from submodule.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>


Revision tags: qemu-kvm-0.12.1.2-2.185.el6, qemu-kvm-0.12.1.2-2.184.el6, qemu-kvm-0.12.1.2-2.183.el6, qemu-kvm-0.12.1.2-2.182.el6, qemu-kvm-0.12.1.2-2.181.el6, qemu-kvm-0.12.1.2-2.180.el6, qemu-kvm-0.12.1.2-2.160.el6_1.8, qemu-kvm-0.12.1.2-2.179.el6, qemu-kvm-0.12.1.2-2.178.el6, qemu-kvm-0.15.0, v0.15.0
# 81e34a24 04-Aug-2011 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'mst/for_anthony' into staging


Revision tags: v0.15.0-rc2, qemu-kvm-0.12.1.2-2.177.el6, qemu-kvm-0.12.1.2-2.160.el6_1.7, qemu-kvm-0.12.1.2-2.176.el6, qemu-kvm-0.15.0-rc1, v0.15.0-rc1, qemu-kvm-0.12.1.2-2.175.el6
# e3745602 29-Jul-2011 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'kraxel/migration.2' into staging


Revision tags: qemu-kvm-0.12.1.2-2.174.el6, qemu-kvm-0.12.1.2-2.173.el6, qemu-kvm-0.15.0-rc0, qemu-kvm-0.12.1.2-2.160.el6_1.6, qemu-kvm-0.12.1.2-2.172.el6, v0.15.0-rc0
# e07fc405 22-Jul-2011 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'spice/spice.v39' into staging


# bf1cd9b4 22-Jul-2011 Anthony Liguori <aliguori@us.ibm.com>

Merge remote-tracking branch 'kwolf/for-anthony' into staging


# 6c916eda 20-Jul-2011 Blue Swirl <blauwirbel@gmail.com>

Update OpenBIOS images for Sparc32 and Sparc64

Update Sparc32 and Sparc64 OpenBIOS images to SVN revision 1045.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>


Revision tags: qemu-kvm-0.12.1.2-2.160.el6_1.5, qemu-kvm-0.12.1.2-2.160.el6_1.4, qemu-kvm-0.12.1.2-2.171.el6, qemu-kvm-0.12.1.2-2.160.el6_1.3, qemu-kvm-0.12.1.2-2.170.el6, qemu-kvm-0.12.1.2-2.169.el6, qemu-kvm-0.12.1.2-2.168.el6, qemu-kvm-0.12.1.2-2.167.el6, qemu-kvm-0.12.1.2-2.166.el6, qemu-kvm-0.12.1.2-2.160.el6_1.2, qemu-kvm-0.12.1.2-2.160.el6_1, qemu-kvm-0.12.1.2-2.165.el6, qemu-kvm-0.12.1.2-2.164.el6, qemu-kvm-0.12.1.2-2.163.el6, qemu-kvm-0.12.1.2-2.162.el6, qemu-kvm-0.14.1, v0.14.1, qemu-kvm-0.12.1.2-2.161.el6, RHEL-6.1, qemu-kvm-0.12.1.2-2.160.el6, qemu-kvm-0.12.1.2-2.159.el6, qemu-kvm-0.12.1.2-2.158.el6, qemu-kvm-0.12.1.2-2.157.el6, qemu-kvm-0.12.1.2-2.156.el6, qemu-kvm-0.12.1.2-2.155.el6, qemu-kvm-0.12.1.2-2.154.el6, qemu-kvm-0.12.1.2-2.153.el6, qemu-kvm-0.12.1.2-2.152.el6, qemu-kvm-0.12.1.2-2.151.el6, qemu-kvm-0.12.1.2-2.150.el6, qemu-kvm-0.12.1.2-2.113.el6_0.8, qemu-kvm-0.12.1.2-2.149.el6, qemu-kvm-0.12.1.2-2.148.el6, qemu-kvm-0.12.1.2-2.113.el6_0.7, qemu-kvm-0.14.0, qemu-kvm-0.12.1.2-2.147.el6, v0.14.0, qemu-kvm-0.12.1.2-2.146.el6, qemu-kvm-0.12.1.2-2.145.el6, v0.14.0-rc2, qemu-kvm-0.14.0-rc1, qemu-kvm-0.14.0-rc0, qemu-kvm-0.12.1.2-2.144.el6, v0.14.0-rc1, qemu-kvm-0.12.1.2-2.143.el6, qemu-kvm-0.12.1.2-2.142.el6, qemu-kvm-0.12.1.2-2.141.el6, qemu-kvm-0.12.1.2-2.140.el6, qemu-kvm-0.12.1.2-2.139.el6, qemu-kvm-0.12.1.2-2.138.el6, qemu-kvm-0.12.1.2-2.137.el6, qemu-kvm-0.12.1.2-2.136.el6, qemu-kvm-0.12.1.2-2.135.el6, v0.14.0-rc0
# b3a98367 01-Feb-2011 Anthony Liguori <aliguori@us.ibm.com>

Merge remote branch 'qemu-kvm/uq/master' into staging

aliguori: fix build with !defined(KVM_CAP_ASYNC_PF)

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


# 9363ee31 01-Feb-2011 Anthony Liguori <aliguori@us.ibm.com>

Merge remote branch 'spice/spice.v29.pull' into staging

Conflicts:
trace-events


# cfb41c82 01-Feb-2011 Anthony Liguori <aliguori@us.ibm.com>

Merge remote branch 'spice/usb.5' into staging


# e54b7f52 01-Feb-2011 Anthony Liguori <aliguori@us.ibm.com>

Merge remote branch 'amit/for-anthony' into staging


1...<<11121314