Public Git Hosting - qemu/hppa.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: f959d54 1172f65)

commit	d1cdbd12e72cd70211fd1347e5be0c81bd085bef
author	Stuart Brady <stuart.brady@gmail.com>
	Sun, 14 Jun 2009 13:34:01 +0000 (14 14:34 +0100)
committer	Stuart Brady <stuart.brady@gmail.com>
	Sun, 14 Jun 2009 13:34:01 +0000 (14 14:34 +0100)
tree	606ed0b424bfea3b58e957a03615ffa98096b269	tree \| snapshot (tar.gz zip)
parent	f959d548e5bd8a9ea384e4499e4a3d6119c7eb49	commit \| diff
parent	1172f6536247c8f5a382e6f9062034b1e9bec631	commit \| diff

Merge branch 'master' of ssh://repo.or.cz/srv/git/qemu

Conflicts:
Makefile.target
configure
cpu-exec.c
disas.c
hw/boards.h
linux-user/syscall_defs.h

13 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
cpu-exec.c	diff1 \|	diff2 \|	blob \| history
disas.c	diff1 \|	diff2 \|	blob \| history
gdbstub.c	diff1 \|	diff2 \|	blob \| history
hw/dummy_hppa.c	diff1 \|	\|	blob \| history
linux-user/elfload.c	diff1 \|	diff2 \|	blob \| history
linux-user/main.c	diff1 \|	diff2 \|	blob \| history
linux-user/signal.c	diff1 \|	diff2 \|	blob \| history
linux-user/syscall.c	diff1 \|	diff2 \|	blob \| history
linux-user/syscall_defs.h	diff1 \|	diff2 \|	blob \| history
target-hppa/machine.c	diff1 \|	\|	blob \| history

HPPA (PA-RISC) target for QEMU