From: Maxim Baryshnikov Date: Fri, 22 Apr 2016 01:14:18 +0000 (+0200) Subject: Fix of a bad merge. X-Git-Url: https://rtime.felk.cvut.cz/gitweb/jailhouse-test.git/commitdiff_plain/b3e31a6d56a38b1034318b2c2e5e0fef183698c3 Fix of a bad merge. --- diff --git a/l4 b/l4 index b20a0e1..8b80243 160000 --- a/l4 +++ b/l4 @@ -1 +1 @@ -Subproject commit b20a0e12a13e95c6a6c4608d7ee22b8f64e4eccf +Subproject commit 8b802437467cab8f56ad122af7a2b96363996776