tree d70e27c20bc612c58ec123e581f2ce7c02553888
parent 1097d7cef683c30f9768007daae2e961a0686a10
parent f04e879bf296d136bcafd8c5a26e95599b141671
author Linus Torvalds <torvalds@linux-foundation.org> 1268955887 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1268955887 -0700

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