diff --git a/[refs] b/[refs] index 46042eea7fd9..6d398bc83876 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a1450fdf4c69961f3926352fd8bc4ea19676756 +refs/heads/master: 6c83429a1c32c914dfb81939cc2ddece97e48294 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 77cbfb1a696c..7dd34750264f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1132,16 +1132,16 @@ F: fs/bfs/ F: include/linux/bfs_fs.h BLACKFIN ARCHITECTURE -P: Bryan Wu -M: cooloney@kernel.org +P: Mike Frysinger +M: vapier@gentoo.org L: uclinux-dist-devel@blackfin.uclinux.org W: http://blackfin.uclinux.org S: Supported F: arch/blackfin/ BLACKFIN EMAC DRIVER -P: Bryan Wu -M: cooloney@kernel.org +P: Michael Hennerich +M: michael.hennerich@analog.com L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) W: http://blackfin.uclinux.org S: Supported