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

author	Maxim Baryshnikov <barysmax@fel.cvut.cz>
	Thu, 12 May 2016 00:49:40 +0000 (02:49 +0200)
committer	Maxim Baryshnikov <barysmax@fel.cvut.cz>
	Thu, 12 May 2016 00:49:40 +0000 (02:49 +0200)
commit	ae2a533e75d6ae6fb503266a65b267dbcd9e76f6
tree	efb5f031cdcffd6bd4132b47a399685ac17007fd	tree \| snapshot
parent	abba110d97273c01d31cfd26f653e77dc5212005	commit \| diff
parent	11dff97feece0823144bbe800b9e56c6995cd2fb	commit \| diff

Merge branch 'master' of rtime.felk.cvut.cz:jailhouse

Conflicts:
configs/novabox.c