Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 92bec8a 9898370)

commit	a5026e9c7fbf3e8ce8f48b18671badd5a0a81a3a
author	Stefan Weil <sw@weilnetz.de>
	Tue, 6 May 2014 17:22:58 +0000 (6 19:22 +0200)
committer	Stefan Weil <sw@weilnetz.de>
	Tue, 6 May 2014 17:22:58 +0000 (6 19:22 +0200)
tree	4e8bdaccf168366b47a13c03027ba238be720279	tree \| snapshot (tar.gz zip)
parent	92bec8aed55248feb337640156cc63f3700c41db	commit \| diff
parent	9898370497da3f18e0c9555b65c858eabc78ab50	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
configure
linux-user/uname.c

Signed-off-by: Stefan Weil <sw@weilnetz.de>

configure	diff1 \|	diff2 \|	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/uname.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU