Merge with Linux 2.4.0-test4-pre3.
commit5a171ddbe0a502527368f00e663df035d1d36019
authorRalf Baechle <ralf@linux-mips.org>
Wed, 12 Jul 2000 01:56:28 +0000 (12 01:56 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 12 Jul 2000 01:56:28 +0000 (12 01:56 +0000)
treebf8712712f7fb0ed15d2ec33af84d7a04c3a6d7c
parentf4ae78d536e6dfaeb24c01b331fc38d950ed062b
Merge with Linux 2.4.0-test4-pre3.
12 files changed:
arch/sparc/kernel/pcic.c
arch/sparc/kernel/process.c
arch/sparc64/kernel/entry.S
arch/sparc64/kernel/power.c
arch/sparc64/kernel/process.c
arch/sparc64/kernel/time.c
drivers/net/ptifddi.c
drivers/net/sunbmac.c
drivers/net/sunbmac.h
drivers/video/fonts.c
include/asm-sparc/asm_offsets.h
include/asm-sparc64/asm_offsets.h