summaryrefslogtreecommitdiffstats
path: root/fs/fs_parser.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-09-08 06:41:40 +0200
committerDave Airlie <airlied@redhat.com>2020-09-08 06:41:40 +0200
commitce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf (patch)
tree3a54614d597b7b92ada36c5ea26dc994216b628b /fs/fs_parser.c
parentMerge tag 'drm-intel-next-2020-08-24-1' of git://anongit.freedesktop.org/drm/... (diff)
parentLinux 5.9-rc4 (diff)
downloadlinux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.tar.xz
linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.zip
Merge tag 'v5.9-rc4' into drm-next
Backmerge 5.9-rc4 as there is a nasty qxl conflict that needs to be resolved. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'fs/fs_parser.c')
0 files changed, 0 insertions, 0 deletions