review.tizen.org Git - sdk/emulator/qemu.git/commit

author	Michael S. Tsirkin <mst@redhat.com>
	Thu, 5 May 2011 13:39:47 +0000 (16:39 +0300)
committer	Michael S. Tsirkin <mst@redhat.com>
	Thu, 5 May 2011 13:39:47 +0000 (16:39 +0300)
commit	7206a75094a0f026bc81238b5e1faea90ea2c2b5
tree	5274ff496f2665487736a4eec23bf76601e4da44	tree \| snapshot
parent	b2bf01e00b7cc2cc87a82900f2dee3c070047f4f	commit \| diff
parent	747260898fb23bda2cd76ee8a38ef1298c8a78bd	commit \| diff

Merge remote branch 'origin/master' into pci

Conflicts:
exec.c

Domain: SDK / Emulator;