diff options
| author |   Maxime Ripard <maxime@cerno.tech> | 2020-08-18 14:14:25 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-08-18 14:14:25 +0200 |
| commit | d85ddd1318e66c0c2665dbfcbc21a8b66c9152aa (patch) | |
| tree | e49e401abd2468b398d4bc84c7e05c2c2c3b0966 /include/clocksource/timer-ti-dm.h | |
| parent | MAINTAINERS: Change maintainer for hisilicon DRM driver (diff) | |
| parent | Linux 5.9-rc1 (diff) | |
| download | wireguard-linux-d85ddd1318e66c0c2665dbfcbc21a8b66c9152aa.tar.xz wireguard-linux-d85ddd1318e66c0c2665dbfcbc21a8b66c9152aa.zip | |
Merge v5.9-rc1 into drm-misc-next
Sam needs 5.9-rc1 to have dev_err_probe in to merge some patches.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/clocksource/timer-ti-dm.h')
| -rw-r--r-- | include/clocksource/timer-ti-dm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/clocksource/timer-ti-dm.h b/include/clocksource/timer-ti-dm.h index 531ca87fcd08..4c61dade8835 100644 --- a/include/clocksource/timer-ti-dm.h +++ b/include/clocksource/timer-ti-dm.h @@ -1,7 +1,7 @@ /* * OMAP Dual-Mode Timers * - * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ + * Copyright (C) 2010 Texas Instruments Incorporated - https://www.ti.com/ * Tarun Kanti DebBarma <tarun.kanti@ti.com> * Thara Gopinath <thara@ti.com> * |