diff --git a/[refs] b/[refs]
index f6a59474eaca..8b4a008988d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1842f23c05b6a866be831aa60bc8a8731c58ddd0
+refs/heads/master: 6ae7d6f0195a0ec7e5d07821e62c79898cd33fdc
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 66a3865da88d..79471ba4981b 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -155,10 +155,9 @@ S:	Maintained
 F:	drivers/net/r8169.c
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
-M:	Alan Cox <alan@lxorguk.ukuu.org.uk>
 L:	linux-serial@vger.kernel.org
 W:	http://serial.sourceforge.net
-S:	Odd Fixes
+S:	Orphan
 F:	drivers/serial/8250*
 F:	include/linux/serial_8250.h
 
@@ -4997,9 +4996,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
 S:	Maintained
 
 TTY LAYER
-M:	Alan Cox <alan@lxorguk.ukuu.org.uk>
-S:	Maintained
-T:	stgit http://zeniv.linux.org.uk/~alan/ttydev/
+S:	Orphan
 F:	drivers/char/tty_*
 F:	drivers/serial/serial_core.c
 F:	include/linux/serial_core.h
diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c
index 16b5739c516a..0540948e29ab 100644
--- a/trunk/kernel/kprobes.c
+++ b/trunk/kernel/kprobes.c
@@ -694,7 +694,7 @@ int __kprobes register_kprobe(struct kprobe *p)
 	p->addr = addr;
 
 	preempt_disable();
-	if (!__kernel_text_address((unsigned long) p->addr) ||
+	if (!kernel_text_address((unsigned long) p->addr) ||
 	    in_kprobes_functions((unsigned long) p->addr)) {
 		preempt_enable();
 		return -EINVAL;