diff options
author | Takashi Iwai <tiwai@suse.de> | 2024-02-21 13:16:43 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2024-02-21 13:17:06 +0300 |
commit | 3fdecc7d9aca8a824ce3be9d20f6366d132579fc (patch) | |
tree | 9be9686f26842e6deb0b04f597711cdc7526f58a /scripts/lib/kdoc/kdoc_output.py | |
parent | 5f91a62217730910ceb3e712dd0c28ee71423a27 (diff) | |
parent | 67c3d7717efbd46092f217b1f811df1b205cce06 (diff) | |
download | linux-3fdecc7d9aca8a824ce3be9d20f6366d132579fc.tar.xz |
Merge branch 'for-linus' into for-next
Pull 6.8-rc devel branch. The trivial merge conflict got resolved.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'scripts/lib/kdoc/kdoc_output.py')
0 files changed, 0 insertions, 0 deletions