diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-09-20 09:52:03 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-09-20 09:52:03 +0200 |
| commit | 5d7b2676a1e64b624c3996d1148b2f43d0c19995 (patch) | |
| tree | 874b81f35a54974ca79479e124f12fa04d143592 /sysdep/linux | |
| parent | 28427a68c32d5684652dd22400a9143722294886 (diff) | |
| parent | 0fd1c1d091ee8e43eb0e15c67a92960ca581ed5f (diff) | |
Merge commit '0fd1c1d0' into thread-next
Using the "ours" strategy as the changes introduced in merged commits
are already implemented in thread-next in a different way.
Diffstat (limited to 'sysdep/linux')
0 files changed, 0 insertions, 0 deletions