diff options
| author | Rob Clark <robin.clark@oss.qualcomm.com> | 2025-11-01 05:47:30 -0700 |
|---|---|---|
| committer | Rob Clark <robin.clark@oss.qualcomm.com> | 2025-11-01 05:47:30 -0700 |
| commit | cb9f145f638d7afa633632a9290d6ad06caeb8ee (patch) | |
| tree | 1a4dec3bedfb02c62a08a5ebe95717f53e6ded20 /include/linux/can/dev | |
| parent | f5d079564c44baaeedf5e25f4b943aa042ea0eb1 (diff) | |
| parent | f67d54e96bc9e4e20a927868f02c2e9d1aa09751 (diff) | |
Merge remote-tracking branch 'drm/drm-next' into msm-next-robclark
Back-merge drm-next to get caught up.
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>
Diffstat (limited to 'include/linux/can/dev')
| -rw-r--r-- | include/linux/can/dev/peak_canfd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/can/dev/peak_canfd.h b/include/linux/can/dev/peak_canfd.h index f38772fd0c07..d3788a3d0942 100644 --- a/include/linux/can/dev/peak_canfd.h +++ b/include/linux/can/dev/peak_canfd.h @@ -2,8 +2,8 @@ /* * CAN driver for PEAK System micro-CAN based adapters * - * Copyright (C) 2003-2011 PEAK System-Technik GmbH - * Copyright (C) 2011-2013 Stephane Grosjean <s.grosjean@peak-system.com> + * Copyright (C) 2003-2025 PEAK System-Technik GmbH + * Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com> */ #ifndef PUCAN_H #define PUCAN_H |