summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS9
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 <[email protected]>