Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: a088580 4829e03)

commit	cedf01bff84e49e6e40aafb5f70169b562298747
author	Stefan Weil <sw@weilnetz.de>
	Mon, 21 Mar 2016 19:11:39 +0000 (21 20:11 +0100)
committer	Stefan Weil <sw@weilnetz.de>
	Mon, 21 Mar 2016 19:11:39 +0000 (21 20:11 +0100)
tree	65e450f3e079b181e8714dcef1d925b1d7955212	tree \| snapshot (tar.gz zip)
parent	a08858010b78108155a27c890cfe5a6a63e01b35	commit \| diff
parent	4829e0378dfb91d55af9dfd741bd09e8f2c4f91a	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
configure

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

15 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
block/vhdx.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
cpus.c	diff1 \|	diff2 \|	blob \| history
hw/input/ps2.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/ppc405_boards.c	diff1 \|	diff2 \|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
net/tap-win32.c	diff1 \|	diff2 \|	blob \| history
qemu-char.c	diff1 \|	diff2 \|	blob \| history
qemu-io.c	diff1 \|	diff2 \|	blob \| history
tests/test-qmp-input-visitor.c	diff1 \|	diff2 \|	blob \| history
ui/console.c	diff1 \|	diff2 \|	blob \| history
ui/vnc.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU