Merge remote branch 'origin/master' into pci
commit5300f1a5487f67f0bde8ee1081b799108668cb1d
authorMichael S. Tsirkin <mst@redhat.com>
Thu, 5 May 2011 13:39:47 +0000 (5 16:39 +0300)
committerMichael S. Tsirkin <mst@redhat.com>
Thu, 5 May 2011 13:39:47 +0000 (5 16:39 +0300)
tree5274ff496f2665487736a4eec23bf76601e4da44
parent8d4c78e7c8adf0a4440a8de92738b3820fc8215a
parentd2d979c628e4b2c4a3cb71a31841875795c79043
Merge remote branch 'origin/master' into pci

Conflicts:
exec.c
cpu-common.h
exec.c
hw/eepro100.c
hw/ide/ich.c
hw/lsi53c895a.c
hw/pcnet-pci.c
hw/rtl8139.c
hw/usb-ohci.c
kvm-all.c