Skip to content
Commit 4c08b520 authored by Jacobo Giralt's avatar Jacobo Giralt
Browse files

Merge branch 'logger' into integration-1st-round 



Conflicts solved:
	block/elevator.c
	fs/read_write.c

Signed-off-by: default avatarJacobo Giralt <jacobo.giralt@bsc.es>
parents 3d94ddca 55dbc392
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment