diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2021-06-10 12:18:54 +0200 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2021-06-10 12:18:54 +0200 |
commit | 86441fa29e57940eeb00f35fefb1853c1fbe67bb (patch) | |
tree | 270384ffe46fed769d171870e4f7951cbc411bec /drivers/watchdog/s3c2410_wdt.c | |
parent | d098775ed44021293b1962dea61efb19297b8d02 (diff) | |
parent | c707b73f0cfb1acc94a20389aecde65e6385349b (diff) |
Merge drm/drm-next into drm-misc-nextdrm-misc-next-2021-06-10
Backmerging to pick up the latest TTM patches plus conflict resolution.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/watchdog/s3c2410_wdt.c')
0 files changed, 0 insertions, 0 deletions