tree 4996f31e1d7d9e08c04d8bbf018752a71c6cd4c3
parent 7162ab21fe8e82f924002951cd8e87f69358f8b5
parent 932d4a42afa28829fadf3cbfbb0507cc09aafd8b
author Michael S. Tsirkin <mst@redhat.com> 1343570599 +0300
committer Michael S. Tsirkin <mst@redhat.com> 1343570735 +0300

Merge branch pci into master

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

Conflicts:
	hw/esp.c