diff --git a/[refs] b/[refs] index 2fb881451b9a..80192802177a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d8549085377674224bf30a368284c391a3ce40e +refs/heads/master: 6d26b3a187467299851e758f60121a2a71a7962d diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 3105c4868c4e..4e734ed187e4 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6585,9 +6585,7 @@ F: drivers/media/platform/s3c-camif/ F: include/media/s3c_camif.h SERIAL DRIVERS -M: Alan Cox L: linux-serial@vger.kernel.org -S: Maintained F: drivers/tty/serial SYNOPSYS DESIGNWARE DMAC DRIVER