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

author	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 14 Jun 2010 15:33:36 +0000 (10:33 -0500)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 14 Jun 2010 15:33:36 +0000 (10:33 -0500)
commit	695dabef9eb637eb22717658cf27f9612fe48bcb
tree	4ecdac95fb7bb86eefc08ee38ca229c4d89e02e0	tree \| snapshot
parent	f9d6a56c3a5db42696bda6347bf48827a9f487e4	commit \| diff
parent	cb43754cc0175b144dda52aead741cb1cbf287cd	commit \| diff

Merge remote branch 'kwolf/for-anthony' into staging

Conflicts:
hw/pc.c

Domain: SDK / Emulator;