Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 3b20617 d44122e)

commit	8aab042afaadd2b7597b809efb2dccaf184be39a
author	Stefan Weil <sw@weilnetz.de>
	Wed, 13 Apr 2016 16:23:08 +0000 (13 18:23 +0200)
committer	Stefan Weil <sw@weilnetz.de>
	Wed, 13 Apr 2016 16:23:08 +0000 (13 18:23 +0200)
tree	5b54e2944b6fd2f56fff9bf412864966f4a92b65	tree \| snapshot (tar.gz zip)
parent	3b2061747c30478212cc50b1790d19f298f4b7f1	commit \| diff
parent	d44122ecd0fa62d20762bdd8f214f077cb8e011b	commit \| diff

Merge remote-tracking branch 'qemu/master'

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
qemu-io.c	diff1 \|	diff2 \|	blob \| history
ui/console.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU