summaryrefslogtreecommitdiff
path: root/drivers/watchdog/s3c2410_wdt.c
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2021-06-10 12:18:54 +0200
committerThomas Zimmermann <tzimmermann@suse.de>2021-06-10 12:18:54 +0200
commit86441fa29e57940eeb00f35fefb1853c1fbe67bb (patch)
tree270384ffe46fed769d171870e4f7951cbc411bec /drivers/watchdog/s3c2410_wdt.c
parentd098775ed44021293b1962dea61efb19297b8d02 (diff)
parentc707b73f0cfb1acc94a20389aecde65e6385349b (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