diff --git a/[refs] b/[refs] index 88fd4a59a90a..0780a02ab468 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ed01bbb89c943f714bdf4876f749b1b01792f65 +refs/heads/master: 0632973db2dc161868b2877f77bd72982d2f7017 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 2c2a3bf1a37a..85819e6a4514 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1582,12 +1582,6 @@ W: http://www.arm.linux.org.uk/ S: Maintained F: drivers/video/cyber2000fb.* -CYBLAFB FRAMEBUFFER DRIVER -P: Knut Petersen -M: Knut_Petersen@t-online.de -L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) -S: Maintained - CYCLADES 2X SYNC CARD DRIVER P: Arnaldo Carvalho de Melo M: acme@ghostprotocols.net