aboutsummaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org> 2010-03-18 16:44:47 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org> 2010-03-18 16:44:47 -0700
commit7de4a9a73563e5f6f3c153015fadee433a443241 (patch)
treed70e27c20bc612c58ec123e581f2ce7c02553888 /mm
parentMerge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/... (diff)
parentsunxvr1000: Add missing FB=y depenency. (diff)
downloadlinux-7de4a9a73563e5f6f3c153015fadee433a443241.tar.gz
linux-7de4a9a73563e5f6f3c153015fadee433a443241.tar.bz2
linux-7de4a9a73563e5f6f3c153015fadee433a443241.zip
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
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions