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

author	Maxim Baryshnikov <barysmax@fel.cvut.cz>
	Fri, 22 Apr 2016 00:52:08 +0000 (02:52 +0200)
committer	Maxim Baryshnikov <barysmax@fel.cvut.cz>
	Fri, 22 Apr 2016 00:52:08 +0000 (02:52 +0200)
commit	b20a0e12a13e95c6a6c4608d7ee22b8f64e4eccf
tree	2ab6fc6b51b14edc69ef5f3595da61f48a366de1	tree \| snapshot
parent	72e6cd65b32dc4846ab1c57eee660d414a1233b9	commit \| diff
parent	e3e88cd02e4e26d0d588e4c756f63f7aa9447267	commit \| diff

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

Conflicts:
l4/pkg/drivers-frst/include/io_regblock_port.h