git.maquefel.me Git - qemu.git/commit

projects / qemu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7162ab2 932d4a4)

author	Michael S. Tsirkin <mst@redhat.com>
	Sun, 29 Jul 2012 14:03:19 +0000 (17:03 +0300)
committer	Michael S. Tsirkin <mst@redhat.com>
	Sun, 29 Jul 2012 14:05:35 +0000 (17:05 +0300)
commit	5e59b024351f827f903f98ae522687ea53dc4f23
tree	4996f31e1d7d9e08c04d8bbf018752a71c6cd4c3	tree \| snapshot
parent	7162ab21fe8e82f924002951cd8e87f69358f8b5	commit \| diff
parent	932d4a42afa28829fadf3cbfbb0507cc09aafd8b	commit \| diff

Merge branch pci into master

Merge master and pci branch, resolve build breakage in hw/esp.c
introduced by f90c2bcd.

Conflicts:
hw/esp.c

19 files changed:

hw/e1000.c	diff1 \|	diff2 \|	blob \| history
hw/eepro100.c	diff1 \|	diff2 \|	blob \| history
hw/esp.c	diff1 \|	diff2 \|	blob \| history
hw/ide/cmd646.c	diff1 \|	diff2 \|	blob \| history
hw/ide/ich.c	diff1 \|	diff2 \|	blob \| history
hw/ide/piix.c	diff1 \|	diff2 \|	blob \| history
hw/ide/via.c	diff1 \|	diff2 \|	blob \| history
hw/intel-hda.c	diff1 \|	diff2 \|	blob \| history
hw/ivshmem.c	diff1 \|	diff2 \|	blob \| history
hw/lsi53c895a.c	diff1 \|	diff2 \|	blob \| history
hw/ne2000.c	diff1 \|	diff2 \|	blob \| history
hw/pci.c	diff1 \|	diff2 \|	blob \| history
hw/pci.h	diff1 \|	diff2 \|	blob \| history
hw/pci_bridge.c	diff1 \|	diff2 \|	blob \| history
hw/pci_internals.h	diff1 \|	diff2 \|	blob \| history
hw/pcnet-pci.c	diff1 \|	diff2 \|	blob \| history
hw/rtl8139.c	diff1 \|	diff2 \|	blob \| history
hw/usb/hcd-uhci.c	diff1 \|	diff2 \|	blob \| history
hw/virtio-pci.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.