diff --git a/[refs] b/[refs] index f8b4a8514a1e..30e1c0580d98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 819c1a651fec6b370211609ce6eceefd20cf31e4 +refs/heads/master: d6db46675dba21203378b6993068ec04bb53389c diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 1a1c27b9c557..5202dc3ad5c4 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -559,14 +559,14 @@ W: http://maxim.org.za/at91_26.html S: Maintained ARM/BCMRING ARM ARCHITECTURE -M: Leo Chen +M: Jiandong Zheng M: Scott Branden L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-bcmring ARM/BCMRING MTD NAND DRIVER -M: Leo Chen +M: Jiandong Zheng M: Scott Branden L: linux-mtd@lists.infradead.org S: Maintained