[parisc-linux] files still needing manual merging

[Michael Ang]

Conflicted files which still need to be manually merged using 'cvs up
-jlinus2329 -jlinus2342'

`Makefile'
`drivers/block/rd.c'
`drivers/char/Makefile'
`drivers/char/serial.c'
`drivers/net/tulip.c'
`include/asm-arm/arch-ebsa285/hardware.h'
`include/linux/init.h'`include/linux/mm.h'
`init/main.c'
`kernel/resource.c'
`mm/Makefile'
`mm/bootmem.c'

Files which had conflicts and currently have fixes checked in
drivers/block/ide-dma.c
drivers/video/fm2fb.c
fs/Makefile
fs/buffer.c
include/linux/init.h
include/linux/mm.h
include/linux/ncp_fs.h
mm/filemap.c