diff --git a/[refs] b/[refs] index f171d875ad6c..5d2d20ed7894 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d38e24e260daf11365efd4ed621235fe9c0ba7ee +refs/heads/master: 105d7b38b08f85c9abc3fd31e5cfa7ee4cf0a402 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index f3d9adec5aa8..abf7f7a17ae0 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1168,11 +1168,6 @@ L: linux1394-devel@lists.sourceforge.net W: http://www.linux1394.org/ S: Orphan -IEEE 1394 SBP2 -L: linux1394-devel@lists.sourceforge.net -W: http://www.linux1394.org/ -S: Orphan - IEEE 1394 SUBSYSTEM P: Ben Collins M: bcollins@debian.org @@ -1207,6 +1202,15 @@ L: linux1394-devel@lists.sourceforge.net W: http://www.linux1394.org/ S: Maintained +IEEE 1394 SBP2 +P: Ben Collins +M: bcollins@debian.org +P: Stefan Richter +M: stefanr@s5r6.in-berlin.de +L: linux1394-devel@lists.sourceforge.net +W: http://www.linux1394.org/ +S: Maintained + IMS TWINTURBO FRAMEBUFFER DRIVER P: Paul Mundt M: lethal@chaoticdreams.org