vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAINTAINERS: Remove merge garbage

Browse Source 
When I merged the changes in commit 0d8e33717d ("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>
This commit is contained in:
Tom Rini
2026-07-01 11:17:06 -06:00
parent ae169744cf
commit 204eefab53
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MAINTAINERS
-9
View File
@@ -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>