summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS3
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 921ce05755a..7a3b4d3712c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -224,7 +224,6 @@ ARM BROADCOM BCMBCA
M: Anand Gore <[email protected]>
M: William Zhang <[email protected]>
M: Kursad Oney <[email protected]>
-M: Joel Peshkin <[email protected]>
M: Philippe Reynes <[email protected]>
S: Maintained
F: arch/arm/mach-bcmbca/
@@ -1568,7 +1567,7 @@ F: cmd/sqfs.c
F: test/py/tests/test_fs/test_squashfs/
STACKPROTECTOR
-M: Joel Peshkin <[email protected]>
+M: William Zhang <[email protected]>
S: Maintained
F: common/stackprot.c
F: cmd/stackprot_test.c