| commit | b6a565718f2ad15839a8712bf2561398f711c8b9 | [log] [tgz] |
|---|---|---|
| author | Cyril Hrubis <chrubis@suse.cz> | Tue Dec 11 20:58:12 2012 +0100 |
| committer | Cyril Hrubis <metan@ucw.cz> | Tue Dec 11 21:15:57 2012 +0100 |
| tree | c560dd39e2c33eb43d920e837b36c4aecafcf361 | |
| parent | 26813cd41ecd11f5a5e983fec9ed0813dbfba2b4 [diff] | |
| parent | 8e684e8f28e1629382b1fb8426df0aef5d2a4002 [diff] |
Merge ../ltp-dev Conflicts: testcases/kernel/syscalls/clone/clone05.c testcases/kernel/syscalls/exit/exit01.c testcases/kernel/syscalls/flock/flock03.c testcases/kernel/syscalls/pause/pause02.c Fix conflicts. Signed-off-by: Cyril Hrubis <chrubis@suse.cz>