diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 12:03:02 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 12:03:22 +0100 |
| commit | c862dd7aaec4d9fe6e0585377ced09b6dd3831a3 (patch) | |
| tree | 6ef6d599c50c29f7bac1a396c617623f6ecfee0a /net/unix/af_unix.c | |
| parent | 82e6ec27b7209116ff1540b39e04ae7ab74357a7 (diff) | |
| parent | 00c03985402ee5e9dffa643f45b9291274bf4070 (diff) | |
Merge tag 'v5.15.136' into fslc-5.15-2.2.x-imx
This is the 5.15.136 stable release
Conflicts:
Documentation/security/keys/trusted-encrypted.rst
security/keys/trusted-keys/trusted_core.c
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions