MAINTAINERS: Remove merge garbage
PATCH 1/1 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 <[email protected]>
Signed-off-by Tom Rini <[email protected]>
--- MAINTAINERS | 9 --------- 1 file changed, 9 deletions(-)
MAINTAINERS +0 -9
@@ -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 <[email protected]>
Signature · 1 line
2.43.0
Quoted 5 lines · Tom Rini
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.
Applied to u-boot/next, thanks!
[1/1] MAINTAINERS: Remove merge garbage
commit: 204eefab537f8f662abdbbce09eb6b5884ae699d
Signature · 1 line
Tom