aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-08 16:42:11 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-08 16:42:11 -0700
commit61ce7b3ab55e6dd3a9811d0cf4f2dc5a3a5d892a (patch)
treebc1dd3b052f28ac40c2cedbbe251b70ced303644 /fs
parent7bea96fd22a8fd19f90817405b4abe032317a0e3 (diff)
parent27f768192fe2d96936cef5d4713e228daee07ae2 (diff)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Cleanup unnecessary <asm/ptrace.h> inclusions. [MIPS] DEC: pt_regs fixes for buserror handlers [MIPS] Fix return type of gt64120_irq. [MIPS] Ocelot C: Build fix - ll_mv64340_irq takes no more regs argument. [MIPS] Jazz defconfig file. [MIPS] Jazz: build fix - include <linux/screen_info.h> [MIPS] Jazz: Remove warning. After 7 years probably somebody test this ;) [MIPS] Jazz: Fix I/O port resources. [MIPS] DEC: pt_regs fixes for dec_intr_halt. handle_sysrq lost its pt_regs * argument Manual conflict resolved in arch/um/drivers/mconsole_kern.c
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions