| commit | 7de4a9a73563e5f6f3c153015fadee433a443241 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 18 16:44:47 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 18 16:44:47 2010 -0700 |
| tree | d70e27c20bc612c58ec123e581f2ce7c02553888 | |
| parent | 1097d7cef683c30f9768007daae2e961a0686a10 [diff] | |
| parent | f04e879bf296d136bcafd8c5a26e95599b141671 [diff] |
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