diff options
| author | Tom Rini <trini@konsulko.com> | 2026-07-01 11:17:06 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2026-07-01 11:17:06 -0600 |
| commit | 204eefab537f8f662abdbbce09eb6b5884ae699d (patch) | |
| tree | 870170e4d97b022848e757684316b34aa5b8dfdb | |
| parent | ae169744cf69fe08310e4184058c0cf6a21b99b2 (diff) | |
| download | u-boot-204eefab537f8f662abdbbce09eb6b5884ae699d.tar.gz u-boot-204eefab537f8f662abdbbce09eb6b5884ae699d.zip | |
MAINTAINERS: Remove merge garbage
When I merged the changes in commit 0d8e33717d7e ("Merge patch series
"arm: aspeed: add initial AST2700 SoC support"") I didn't fully remove
the before/after changes. Finish this merge now.
Reported-by: Yao Zi <me@ziyao.cc>
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9abc4bcbfd9..f4eb2c13a43 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -232,15 +232,6 @@ F: arch/arm/mach-axiado/ F: board/axiado/scm3005/ F: configs/ax3005_scm3005_defconfig F: include/configs/ax3005-scm3005.h -======= -F: drivers/pinctrl/aspeed/ -F: drivers/pwm/pwm-aspeed.c -F: drivers/ram/aspeed/ -F: drivers/reset/reset-ast*.c -F: drivers/watchdog/ast_wdt.c -N: aspeed -N: ast2700 ->>>>>>> 4a72fd9fb09109857303ca64fd259009e1d4b554 ARM BROADCOM BCM283X / BCM27XX M: Matthias Brugger <mbrugger@suse.com> |