summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2023-08-24 10:27:21 +0300
committerTakashi Iwai <tiwai@suse.de>2023-08-24 10:27:21 +0300
commita057efde80453c68c60e156803578a654b52c39f (patch)
tree51c312e95de536b6a29d18a12cfdba72029e09ad /.gitattributes
parent17a1eab7b70d85fc5711f37bb6e530b771736bb7 (diff)
parenta4a6eed851bb661477654d772807d0e5aee5629c (diff)
downloadlinux-a057efde80453c68c60e156803578a654b52c39f.tar.xz
Merge branch 'for-linus' into for-next
Back-merge the 6.5-devel branch for the clean patch application for 6.6 and resolving merge conflicts. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions