Merge remote branch 'origin/master' into pci
commitc924f36a300cbc54d3cb511116e8e2bae17f5ae6
authorMichael S. Tsirkin <mst@redhat.com>
Wed, 1 Dec 2010 05:11:51 +0000 (1 07:11 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 1 Dec 2010 05:11:51 +0000 (1 07:11 +0200)
tree04e57676b1db1db7d8b33934b349f8f37780fa2a
parent1abeb5a65d515f8a8a9cfc4a82342f731bd9321f
parent09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2
Merge remote branch 'origin/master' into pci

Conflicts:
Makefile.objs
hw/virtio.c
Makefile
Makefile.objs
hw/e1000.c
hw/ide/via.c
vl.c