]> rtime.felk.cvut.cz Git - l4.git/commit
Manual fix of bad merge.
authorMaxim Baryshnikov <barysmax@fel.cvut.cz>
Fri, 22 Apr 2016 01:12:04 +0000 (03:12 +0200)
committerMaxim Baryshnikov <barysmax@fel.cvut.cz>
Fri, 22 Apr 2016 01:12:04 +0000 (03:12 +0200)
commit8b802437467cab8f56ad122af7a2b96363996776
treec7fd42715adc7fdcb909ffbdc527442e9c912939
parentb20a0e12a13e95c6a6c4608d7ee22b8f64e4eccf
Manual fix of bad merge.
l4/pkg/drivers-frst/include/io_regblock_port.h