From: Linus Torvalds Date: Thu, 18 Mar 2010 23:44:47 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: firefly_0821_release~9833^2~2572 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7de4a9a73563e5f6f3c153015fadee433a443241;p=firefly-linux-kernel-4.4.55.git Merge git://git./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 --- 7de4a9a73563e5f6f3c153015fadee433a443241