Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sunxvr1000: Add missing FB=y depenency.
  MAINTAINERS: Add entry for sparc serial drivers.
  drivers/serial/sunsab.c: adjust the constant used to initialize the interrupt_mask0 fields

1 files changed, 15 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 47cc449d89d8..382eaa4d0068 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5214,6 +5214,21 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 S:      Maintained
 F:      arch/sparc/
 
+SPARC SERIAL DRIVERS
+M:      "David S. Miller" <davem@davemloft.net>
+L:      sparclinux@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
+S:      Maintained
+F:      drivers/serial/suncore.c
+F:      drivers/serial/suncore.h
+F:      drivers/serial/sunhv.c
+F:      drivers/serial/sunsab.c
+F:      drivers/serial/sunsab.h
+F:      drivers/serial/sunsu.c
+F:      drivers/serial/sunzilog.c
+F:      drivers/serial/sunzilog.h
+
 SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
 M:      Roger Wolff <R.E.Wolff@BitWizard.nl>
 S:      Supported