rtime.felk.cvut.cz Git - jailhouse.git/commit

author	Maxim Baryshnikov <barysmax@fel.cvut.cz>
	Wed, 27 Jul 2016 14:56:47 +0000 (16:56 +0200)
committer	Maxim Baryshnikov <barysmax@fel.cvut.cz>
	Wed, 27 Jul 2016 14:56:47 +0000 (16:56 +0200)
commit	f053c948f5b6fe7b9ec5cf6533e177fd42113ba3
tree	dc0cf893ca965d00c03ed1679292f76c51d4e32f	tree \| snapshot
parent	4e0ea74420900c7a66d265117b09fddbc3aaa754	commit \| diff
parent	51f3bdab18fe814430b7d01886494f532d9f4566	commit \| diff

Merge remote-tracking branch 'kiszka/master'

# Conflicts:
# hypervisor/arch/x86/dbg-write.c -- solved, remote version was choosen.