[PATCH] MAINTAINERS: Remove merge garbage

[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.

Reported-by: Yao Zi <me at ziyao.cc>
Signed-off-by: Tom Rini <trini at konsulko.com>
---
 MAINTAINERS | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9abc4bcbfd9b..f4eb2c13a43f 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 at suse.com>
-- 
2.43.0