diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-05 16:20:26 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-05 16:20:26 -0500 |
| commit | 720620e6916ba40b9a173bb07706d2c73f3c23e7 (patch) | |
| tree | b085821f1d1137d80e9bb73f405ea0680db338b9 /drivers/reset | |
| parent | c86b18074c9d40bfa63cda1068b6dfb810d4377d (diff) | |
| parent | 62b07b5173e3d04fabfac42cf1f4779d021f94ad (diff) | |
| download | u-boot-720620e6916ba40b9a173bb07706d2c73f3c23e7.zip u-boot-720620e6916ba40b9a173bb07706d2c73f3c23e7.tar.gz u-boot-720620e6916ba40b9a173bb07706d2c73f3c23e7.tar.bz2 | |
Merge tag 'v2021.01-rc5' into next
Prepare v2021.01-rc5
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/reset')
| -rw-r--r-- | drivers/reset/sti-reset.c | 2 | ||||
| -rw-r--r-- | drivers/reset/stm32-reset.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c index b03638d..8041490 100644 --- a/drivers/reset/sti-reset.c +++ b/drivers/reset/sti-reset.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved - * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. + * Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics. */ #include <common.h> diff --git a/drivers/reset/stm32-reset.c b/drivers/reset/stm32-reset.c index 4a05ab6..b84c9da 100644 --- a/drivers/reset/stm32-reset.c +++ b/drivers/reset/stm32-reset.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved - * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. + * Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics. */ #include <common.h> |