diff --git a/[refs] b/[refs] index 2db29d4485f9..4785d2e95d1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79896cf42f6a96d7e14f2dc3473443d68d74031d +refs/heads/master: 57d7f282271a83fe4ca4bd15eee79be577210210 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index d6befb2c470f..b1114cfac6bf 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4995,7 +4995,9 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git S: Maintained TTY LAYER -S: Orphan +M: Greg Kroah-Hartman +S: Maintained +T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ F: drivers/char/tty_* F: drivers/serial/serial_core.c F: include/linux/serial_core.h