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	5300f1a5487f67f0bde8ee1081b799108668cb1d
tree	5274ff496f2665487736a4eec23bf76601e4da44	tree \| snapshot
parent	8d4c78e7c8adf0a4440a8de92738b3820fc8215a	commit \| diff
parent	d2d979c628e4b2c4a3cb71a31841875795c79043	commit \| diff

Merge remote branch 'origin/master' into pci

Conflicts:
exec.c

Domain: SDK / Emulator;