vcs.maemo.org Git - qemu/commit - configure

projects / qemu / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 647d24d 69bd582)

author	Riku Voipio <riku.voipio@nokia.com>
	Mon, 9 Mar 2009 14:03:23 +0000 (16:03 +0200)
committer	Riku Voipio <riku.voipio@nokia.com>
	Mon, 9 Mar 2009 14:03:23 +0000 (16:03 +0200)
commit	e615f148151979409e5b72bf637f950068c1e2f4
tree	321194fa33b25ac9ee32521af85148f19e77de81	tree \| snapshot
parent	647d24d30fc04f8138f56c92fdfc93ad5fdcd7d9	commit \| diff
parent	69bd582091a8dee1dc0eb62edcac9235c0f12aa1	commit \| diff

Merge branch 'upstream' into maemo-test

Conflicts:

linux-user/syscall.c
target-arm/helper.c

Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
cpu-all.h	diff1 \|	diff2 \|	blob \| history
hw/omap_clk.c	diff1 \|	diff2 \|	blob \| history
linux-user/main.c	diff1 \|	diff2 \|	blob \| history
linux-user/qemu.h	diff1 \|	diff2 \|	blob \| history
linux-user/signal.c	diff1 \|	diff2 \|	blob \| history
linux-user/syscall.c	diff1 \|	diff2 \|	blob \| history
target-arm/cpu.h	diff1 \|	diff2 \|	blob \| history
tcg/x86_64/tcg-target.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file to name it for gitweb.