More random merges.linux-2.3.99-pre2
commitfe7ff1706e323d0e5ed83972960a1ecc1ee538b3
authorRalf Baechle <ralf@linux-mips.org>
Mon, 27 Mar 2000 23:02:57 +0000 (27 23:02 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 27 Mar 2000 23:02:57 +0000 (27 23:02 +0000)
treeea981c326df87ea42e09628e63ac53fdc4c0f9d0
parentbf78a0c2204c5db7d03f193abdae9128a96d8e61
More random merges.
arch/mips/sgi/kernel/indy_sc.c
arch/mips64/sgi-ip22/ip22-sc.c
drivers/net/sgiseeq.c
include/asm-mips/sigcontext.h