diff options
| author | Tom Rini <trini@konsulko.com> | 2023-11-20 09:19:50 -0500 | 
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-20 09:19:50 -0500 | 
| commit | dca7a8958f8d0dbd53072caa4353353e062d80ca (patch) | |
| tree | 2ba9b27f1799d23f5bd3355feaf6276646297b9d /include/linux | |
| parent | 9e4b42267e1fb5805ecddbb92629f456d8cd4047 (diff) | |
| parent | 24ca49b33af98d54d6cd2e845f071f6565345ffd (diff) | |
Merge tag 'v2024.01-rc3' into next
Prepare v2024.01-rc3
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/soc/ti/cppi5.h | 2 | ||||
| -rw-r--r-- | include/linux/soc/ti/k3-navss-ringacc.h | 2 | ||||
| -rw-r--r-- | include/linux/soc/ti/k3-sec-proxy.h | 2 | ||||
| -rw-r--r-- | include/linux/soc/ti/ti-udma.h | 2 | ||||
| -rw-r--r-- | include/linux/soc/ti/ti_sci_protocol.h | 2 | ||||
| -rw-r--r-- | include/linux/usb/dwc3-omap.h | 2 | ||||
| -rw-r--r-- | include/linux/usb/otg.h | 2 | 
7 files changed, 7 insertions, 7 deletions
| diff --git a/include/linux/soc/ti/cppi5.h b/include/linux/soc/ti/cppi5.h index 3a55c3ec46f..c5d7ebd05d7 100644 --- a/include/linux/soc/ti/cppi5.h +++ b/include/linux/soc/ti/cppi5.h @@ -2,7 +2,7 @@  /*   * CPPI5 descriptors interface   * - * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com + * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com   */  #ifndef __TI_CPPI5_H__ diff --git a/include/linux/soc/ti/k3-navss-ringacc.h b/include/linux/soc/ti/k3-navss-ringacc.h index 0ad8f203da1..30fb903d972 100644 --- a/include/linux/soc/ti/k3-navss-ringacc.h +++ b/include/linux/soc/ti/k3-navss-ringacc.h @@ -2,7 +2,7 @@  /*   * TI K3 AM65x NAVSS Ring accelerator Manager (RA) subsystem driver   * - * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com + * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com   */  #ifndef __SOC_TI_K3_NAVSS_RINGACC_API_H_ diff --git a/include/linux/soc/ti/k3-sec-proxy.h b/include/linux/soc/ti/k3-sec-proxy.h index f34854ceebc..c3a83f163d7 100644 --- a/include/linux/soc/ti/k3-sec-proxy.h +++ b/include/linux/soc/ti/k3-sec-proxy.h @@ -2,7 +2,7 @@  /*   * Texas Instruments' K3 Secure proxy   * - * Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ + * Copyright (C) 2017-2018 Texas Instruments Incorporated - https://www.ti.com/   *	Lokesh Vutla <lokeshvutla@ti.com>   *   */ diff --git a/include/linux/soc/ti/ti-udma.h b/include/linux/soc/ti/ti-udma.h index 04e354fb2d6..89faf69242f 100644 --- a/include/linux/soc/ti/ti-udma.h +++ b/include/linux/soc/ti/ti-udma.h @@ -1,6 +1,6 @@  /* SPDX-License-Identifier: GPL-2.0 */  /* - *  Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com + *  Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com   *  Author: Peter Ujfalusi <peter.ujfalusi@ti.com>   */ diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h index 7f9941894cd..8e4c43cef31 100644 --- a/include/linux/soc/ti/ti_sci_protocol.h +++ b/include/linux/soc/ti/ti_sci_protocol.h @@ -3,7 +3,7 @@   * Texas Instruments System Control Interface Protocol   * Based on include/linux/soc/ti/ti_sci_protocol.h from Linux.   * - * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ + * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/   *	Nishanth Menon   *	Lokesh Vutla <lokeshvutla@ti.com>   */ diff --git a/include/linux/usb/dwc3-omap.h b/include/linux/usb/dwc3-omap.h index 62180e3973b..d5737ed7e88 100644 --- a/include/linux/usb/dwc3-omap.h +++ b/include/linux/usb/dwc3-omap.h @@ -1,7 +1,7 @@  /* SPDX-License-Identifier: GPL-2.0+ */  /* include/linux/usb/dwc3-omap.h   * - * Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com + * Copyright (c) 2014 Texas Instruments Incorporated - https://www.ti.com   *   * Designware SuperSpeed Glue   */ diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index 5d0dac950ef..e7e3d259cae 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -1,7 +1,7 @@  /* SPDX-License-Identifier: GPL-2.0+ */  /* include/linux/usb/otg.h   * - * Copyright (c) 2015 Texas Instruments Incorporated - http://www.ti.com + * Copyright (c) 2015 Texas Instruments Incorporated - https://www.ti.com   *   * USB OTG (On The Go) defines   */ | 
