Merge cantab.net:/home/src/bklinux-2.6

into cantab.net:/home/src/ntfs-2.6

Merge cantab.net:/home/src/bklinux-2.6
into cantab.net:/home/src/ntfs-2.6
42a90551 · Anton Altaparmakov · d14e09af · 141baf80 · 42a90551 · 42a90551
Commit 42a90551 authored May 11, 2004 by Anton Altaparmakov
199 changed files
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
--- a/arch/m68k/amiga/amisound.c
+++ b/arch/m68k/amiga/amisound.c
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
--- a/arch/m68k/apollo/config.c
+++ b/arch/m68k/apollo/config.c
--- a/arch/m68k/apollo/dma.c
+++ b/arch/m68k/apollo/dma.c
--- a/arch/m68k/apollo/dn_debug.c
+++ b/arch/m68k/apollo/dn_debug.c
--- a/arch/m68k/apollo/dn_ints.c
+++ b/arch/m68k/apollo/dn_ints.c
--- a/arch/m68k/atari/ataints.c
+++ b/arch/m68k/atari/ataints.c
--- a/arch/m68k/atari/atasound.c
+++ b/arch/m68k/atari/atasound.c
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
--- a/arch/m68k/atari/debug.c
+++ b/arch/m68k/atari/debug.c
--- a/arch/m68k/atari/stdma.c
+++ b/arch/m68k/atari/stdma.c
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
--- a/arch/m68k/atari/time.c
+++ b/arch/m68k/atari/time.c
--- a/arch/m68k/bvme6000/rtc.c
+++ b/arch/m68k/bvme6000/rtc.c
--- a/arch/m68k/defconfig
+++ b/arch/m68k/defconfig
--- a/arch/m68k/fpsp040/README
+++ b/arch/m68k/fpsp040/README
--- a/arch/m68k/fpsp040/bindec.S
+++ b/arch/m68k/fpsp040/bindec.S
--- a/arch/m68k/fpsp040/binstr.S
+++ b/arch/m68k/fpsp040/binstr.S
--- a/arch/m68k/fpsp040/bugfix.S
+++ b/arch/m68k/fpsp040/bugfix.S
--- a/arch/m68k/fpsp040/decbin.S
+++ b/arch/m68k/fpsp040/decbin.S
--- a/arch/m68k/fpsp040/do_func.S
+++ b/arch/m68k/fpsp040/do_func.S
--- a/arch/m68k/fpsp040/fpsp.h
+++ b/arch/m68k/fpsp040/fpsp.h
--- a/arch/m68k/fpsp040/gen_except.S
+++ b/arch/m68k/fpsp040/gen_except.S
--- a/arch/m68k/fpsp040/get_op.S
+++ b/arch/m68k/fpsp040/get_op.S
--- a/arch/m68k/fpsp040/kernel_ex.S
+++ b/arch/m68k/fpsp040/kernel_ex.S
--- a/arch/m68k/fpsp040/res_func.S
+++ b/arch/m68k/fpsp040/res_func.S
--- a/arch/m68k/fpsp040/round.S
+++ b/arch/m68k/fpsp040/round.S
--- a/arch/m68k/fpsp040/sacos.S
+++ b/arch/m68k/fpsp040/sacos.S
--- a/arch/m68k/fpsp040/sasin.S
+++ b/arch/m68k/fpsp040/sasin.S
--- a/arch/m68k/fpsp040/satan.S
+++ b/arch/m68k/fpsp040/satan.S
--- a/arch/m68k/fpsp040/satanh.S
+++ b/arch/m68k/fpsp040/satanh.S
--- a/arch/m68k/fpsp040/scale.S
+++ b/arch/m68k/fpsp040/scale.S
--- a/arch/m68k/fpsp040/scosh.S
+++ b/arch/m68k/fpsp040/scosh.S
--- a/arch/m68k/fpsp040/setox.S
+++ b/arch/m68k/fpsp040/setox.S
--- a/arch/m68k/fpsp040/sgetem.S
+++ b/arch/m68k/fpsp040/sgetem.S
--- a/arch/m68k/fpsp040/sint.S
+++ b/arch/m68k/fpsp040/sint.S
--- a/arch/m68k/fpsp040/skeleton.S
+++ b/arch/m68k/fpsp040/skeleton.S
--- a/arch/m68k/fpsp040/slog2.S
+++ b/arch/m68k/fpsp040/slog2.S
--- a/arch/m68k/fpsp040/slogn.S
+++ b/arch/m68k/fpsp040/slogn.S
--- a/arch/m68k/fpsp040/smovecr.S
+++ b/arch/m68k/fpsp040/smovecr.S
--- a/arch/m68k/fpsp040/srem_mod.S
+++ b/arch/m68k/fpsp040/srem_mod.S
--- a/arch/m68k/fpsp040/ssin.S
+++ b/arch/m68k/fpsp040/ssin.S
--- a/arch/m68k/fpsp040/ssinh.S
+++ b/arch/m68k/fpsp040/ssinh.S
--- a/arch/m68k/fpsp040/stan.S
+++ b/arch/m68k/fpsp040/stan.S
--- a/arch/m68k/fpsp040/stanh.S
+++ b/arch/m68k/fpsp040/stanh.S
--- a/arch/m68k/fpsp040/sto_res.S
+++ b/arch/m68k/fpsp040/sto_res.S
--- a/arch/m68k/fpsp040/stwotox.S
+++ b/arch/m68k/fpsp040/stwotox.S
--- a/arch/m68k/fpsp040/tbldo.S
+++ b/arch/m68k/fpsp040/tbldo.S
--- a/arch/m68k/fpsp040/util.S
+++ b/arch/m68k/fpsp040/util.S
--- a/arch/m68k/fpsp040/x_bsun.S
+++ b/arch/m68k/fpsp040/x_bsun.S
--- a/arch/m68k/fpsp040/x_fline.S
+++ b/arch/m68k/fpsp040/x_fline.S
--- a/arch/m68k/fpsp040/x_operr.S
+++ b/arch/m68k/fpsp040/x_operr.S
--- a/arch/m68k/fpsp040/x_ovfl.S
+++ b/arch/m68k/fpsp040/x_ovfl.S
--- a/arch/m68k/fpsp040/x_snan.S
+++ b/arch/m68k/fpsp040/x_snan.S
--- a/arch/m68k/fpsp040/x_store.S
+++ b/arch/m68k/fpsp040/x_store.S
--- a/arch/m68k/fpsp040/x_unfl.S
+++ b/arch/m68k/fpsp040/x_unfl.S
--- a/arch/m68k/fpsp040/x_unimp.S
+++ b/arch/m68k/fpsp040/x_unimp.S
--- a/arch/m68k/fpsp040/x_unsupp.S
+++ b/arch/m68k/fpsp040/x_unsupp.S
--- a/arch/m68k/hp300/hp300map.map
+++ b/arch/m68k/hp300/hp300map.map
--- a/arch/m68k/hp300/ints.c
+++ b/arch/m68k/hp300/ints.c
--- a/arch/m68k/ifpsp060/CHANGES
+++ b/arch/m68k/ifpsp060/CHANGES
--- a/arch/m68k/ifpsp060/MISC
+++ b/arch/m68k/ifpsp060/MISC
--- a/arch/m68k/ifpsp060/README
+++ b/arch/m68k/ifpsp060/README
--- a/arch/m68k/ifpsp060/TEST.DOC
+++ b/arch/m68k/ifpsp060/TEST.DOC
--- a/arch/m68k/ifpsp060/fplsp.doc
+++ b/arch/m68k/ifpsp060/fplsp.doc
--- a/arch/m68k/ifpsp060/fpsp.doc
+++ b/arch/m68k/ifpsp060/fpsp.doc
--- a/arch/m68k/ifpsp060/fskeleton.S
+++ b/arch/m68k/ifpsp060/fskeleton.S
--- a/arch/m68k/ifpsp060/ilsp.doc
+++ b/arch/m68k/ifpsp060/ilsp.doc
--- a/arch/m68k/ifpsp060/iskeleton.S
+++ b/arch/m68k/ifpsp060/iskeleton.S
--- a/arch/m68k/ifpsp060/isp.doc
+++ b/arch/m68k/ifpsp060/isp.doc
--- a/arch/m68k/ifpsp060/os.S
+++ b/arch/m68k/ifpsp060/os.S
--- a/arch/m68k/ifpsp060/src/fplsp.S
+++ b/arch/m68k/ifpsp060/src/fplsp.S
--- a/arch/m68k/ifpsp060/src/fpsp.S
+++ b/arch/m68k/ifpsp060/src/fpsp.S
--- a/arch/m68k/ifpsp060/src/ftest.S
+++ b/arch/m68k/ifpsp060/src/ftest.S
--- a/arch/m68k/ifpsp060/src/ilsp.S
+++ b/arch/m68k/ifpsp060/src/ilsp.S
--- a/arch/m68k/ifpsp060/src/isp.S
+++ b/arch/m68k/ifpsp060/src/isp.S
--- a/arch/m68k/ifpsp060/src/itest.S
+++ b/arch/m68k/ifpsp060/src/itest.S
--- a/arch/m68k/ifpsp060/src/pfpsp.S
+++ b/arch/m68k/ifpsp060/src/pfpsp.S
--- a/arch/m68k/kernel/bios32.c
+++ b/arch/m68k/kernel/bios32.c
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
--- a/arch/m68k/kernel/ptrace.c
+++ b/arch/m68k/kernel/ptrace.c
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
--- a/arch/m68k/kernel/sun3-head.S
+++ b/arch/m68k/kernel/sun3-head.S
--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
--- a/arch/m68k/kernel/vmlinux-std.lds
+++ b/arch/m68k/kernel/vmlinux-std.lds
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
--- a/arch/m68k/lib/ashldi3.c
+++ b/arch/m68k/lib/ashldi3.c
--- a/arch/m68k/lib/ashrdi3.c
+++ b/arch/m68k/lib/ashrdi3.c
--- a/arch/m68k/lib/lshrdi3.c
+++ b/arch/m68k/lib/lshrdi3.c
--- a/arch/m68k/lib/muldi3.c
+++ b/arch/m68k/lib/muldi3.c
--- a/arch/m68k/mac/baboon.c
+++ b/arch/m68k/mac/baboon.c
--- a/arch/m68k/mac/bootparse.c
+++ b/arch/m68k/mac/bootparse.c
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
--- a/arch/m68k/mac/debug.c
+++ b/arch/m68k/mac/debug.c
--- a/arch/m68k/mac/iop.c
+++ b/arch/m68k/mac/iop.c
--- a/arch/m68k/mac/macboing.c
+++ b/arch/m68k/mac/macboing.c
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
--- a/arch/m68k/mac/misc.c
+++ b/arch/m68k/mac/misc.c
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
--- a/arch/m68k/mac/psc.c
+++ b/arch/m68k/mac/psc.c
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
--- a/arch/m68k/math-emu/fp_arith.c
+++ b/arch/m68k/math-emu/fp_arith.c
--- a/arch/m68k/math-emu/fp_cond.S
+++ b/arch/m68k/math-emu/fp_cond.S
--- a/arch/m68k/math-emu/fp_log.c
+++ b/arch/m68k/math-emu/fp_log.c
--- a/arch/m68k/math-emu/fp_scan.S
+++ b/arch/m68k/math-emu/fp_scan.S
--- a/arch/m68k/math-emu/fp_util.S
+++ b/arch/m68k/math-emu/fp_util.S
--- a/arch/m68k/mm/fault.c
+++ b/arch/m68k/mm/fault.c
--- a/arch/m68k/mm/hwtest.c
+++ b/arch/m68k/mm/hwtest.c
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
--- a/arch/m68k/mm/memory.c
+++ b/arch/m68k/mm/memory.c
--- a/arch/m68k/mm/motorola.c
+++ b/arch/m68k/mm/motorola.c
--- a/arch/m68k/mm/sun3kmap.c
+++ b/arch/m68k/mm/sun3kmap.c
--- a/arch/m68k/mm/sun3mmu.c
+++ b/arch/m68k/mm/sun3mmu.c
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
--- a/arch/m68k/mvme16x/mvme16x_ksyms.c
+++ b/arch/m68k/mvme16x/mvme16x_ksyms.c
--- a/arch/m68k/mvme16x/rtc.c
+++ b/arch/m68k/mvme16x/rtc.c
--- a/arch/m68k/q40/Makefile
+++ b/arch/m68k/q40/Makefile
--- a/arch/m68k/q40/README
+++ b/arch/m68k/q40/README
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
--- a/arch/m68k/q40/q40ints.c
+++ b/arch/m68k/q40/q40ints.c
--- a/arch/m68k/sun3/config.c
+++ b/arch/m68k/sun3/config.c
--- a/arch/m68k/sun3/dvma.c
+++ b/arch/m68k/sun3/dvma.c
--- a/arch/m68k/sun3/idprom.c
+++ b/arch/m68k/sun3/idprom.c
--- a/arch/m68k/sun3/intersil.c
+++ b/arch/m68k/sun3/intersil.c
--- a/arch/m68k/sun3/leds.c
+++ b/arch/m68k/sun3/leds.c
--- a/arch/m68k/sun3/mmu_emu.c
+++ b/arch/m68k/sun3/mmu_emu.c
--- a/arch/m68k/sun3/prom/init.c
+++ b/arch/m68k/sun3/prom/init.c
--- a/arch/m68k/sun3/sun3dvma.c
+++ b/arch/m68k/sun3/sun3dvma.c
--- a/arch/m68k/sun3/sun3ints.c
+++ b/arch/m68k/sun3/sun3ints.c
--- a/arch/m68k/sun3x/config.c
+++ b/arch/m68k/sun3x/config.c
--- a/arch/m68k/sun3x/dvma.c
+++ b/arch/m68k/sun3x/dvma.c
--- a/arch/m68k/sun3x/prom.c
+++ b/arch/m68k/sun3x/prom.c
--- a/arch/m68k/sun3x/time.c
+++ b/arch/m68k/sun3x/time.c
--- a/include/asm-m68k/amigahw.h
+++ b/include/asm-m68k/amigahw.h
--- a/include/asm-m68k/apollodma.h
+++ b/include/asm-m68k/apollodma.h
--- a/include/asm-m68k/apollohw.h
+++ b/include/asm-m68k/apollohw.h
--- a/include/asm-m68k/atafdreg.h
+++ b/include/asm-m68k/atafdreg.h
--- a/include/asm-m68k/atari_SCCserial.h
+++ b/include/asm-m68k/atari_SCCserial.h
--- a/include/asm-m68k/atari_acsi.h
+++ b/include/asm-m68k/atari_acsi.h
--- a/include/asm-m68k/atarihw.h
+++ b/include/asm-m68k/atarihw.h
--- a/include/asm-m68k/atariints.h
+++ b/include/asm-m68k/atariints.h
--- a/include/asm-m68k/bitops.h
+++ b/include/asm-m68k/bitops.h
--- a/include/asm-m68k/bootinfo.h
+++ b/include/asm-m68k/bootinfo.h
--- a/include/asm-m68k/cacheflush.h
+++ b/include/asm-m68k/cacheflush.h
--- a/include/asm-m68k/checksum.h
+++ b/include/asm-m68k/checksum.h
--- a/include/asm-m68k/delay.h
+++ b/include/asm-m68k/delay.h
--- a/include/asm-m68k/dvma.h
+++ b/include/asm-m68k/dvma.h
--- a/include/asm-m68k/entry.h
+++ b/include/asm-m68k/entry.h
--- a/include/asm-m68k/floppy.h
+++ b/include/asm-m68k/floppy.h
--- a/include/asm-m68k/hwtest.h
+++ b/include/asm-m68k/hwtest.h
--- a/include/asm-m68k/ide.h
+++ b/include/asm-m68k/ide.h
--- a/include/asm-m68k/intersil.h
+++ b/include/asm-m68k/intersil.h
--- a/include/asm-m68k/io.h
+++ b/include/asm-m68k/io.h
--- a/include/asm-m68k/ipc.h
+++ b/include/asm-m68k/ipc.h
--- a/include/asm-m68k/irq.h
+++ b/include/asm-m68k/irq.h
--- a/include/asm-m68k/mac_asc.h
+++ b/include/asm-m68k/mac_asc.h
--- a/include/asm-m68k/mac_oss.h
+++ b/include/asm-m68k/mac_oss.h
--- a/include/asm-m68k/mac_psc.h
+++ b/include/asm-m68k/mac_psc.h
--- a/include/asm-m68k/mac_via.h
+++ b/include/asm-m68k/mac_via.h
--- a/include/asm-m68k/machw.h
+++ b/include/asm-m68k/machw.h
--- a/include/asm-m68k/macintosh.h
+++ b/include/asm-m68k/macintosh.h
--- a/include/asm-m68k/macints.h
+++ b/include/asm-m68k/macints.h
--- a/include/asm-m68k/md.h
+++ b/include/asm-m68k/md.h
--- a/include/asm-m68k/mmu_context.h
+++ b/include/asm-m68k/mmu_context.h
--- a/include/asm-m68k/motorola_pgtable.h
+++ b/include/asm-m68k/motorola_pgtable.h
--- a/include/asm-m68k/msgbuf.h
+++ b/include/asm-m68k/msgbuf.h
--- a/include/asm-m68k/mvme147hw.h
+++ b/include/asm-m68k/mvme147hw.h
--- a/include/asm-m68k/mvme16xhw.h
+++ b/include/asm-m68k/mvme16xhw.h
--- a/include/asm-m68k/openprom.h
+++ b/include/asm-m68k/openprom.h
--- a/include/asm-m68k/oplib.h
+++ b/include/asm-m68k/oplib.h
--- a/include/asm-m68k/page.h
+++ b/include/asm-m68k/page.h
--- a/include/asm-m68k/page_offset.h
+++ b/include/asm-m68k/page_offset.h
--- a/include/asm-m68k/q40_master.h
+++ b/include/asm-m68k/q40_master.h
--- a/include/asm-m68k/raw_io.h
+++ b/include/asm-m68k/raw_io.h
--- a/include/asm-m68k/rtc.h
+++ b/include/asm-m68k/rtc.h
--- a/include/asm-m68k/sembuf.h
+++ b/include/asm-m68k/sembuf.h
--- a/include/asm-m68k/serial.h
+++ b/include/asm-m68k/serial.h
--- a/include/asm-m68k/setup.h
+++ b/include/asm-m68k/setup.h
--- a/include/asm-m68k/shmbuf.h
+++ b/include/asm-m68k/shmbuf.h
--- a/include/asm-m68k/sigcontext.h
+++ b/include/asm-m68k/sigcontext.h
--- a/include/asm-m68k/signal.h
+++ b/include/asm-m68k/signal.h
--- a/include/asm-m68k/sockios.h
+++ b/include/asm-m68k/sockios.h
--- a/include/asm-m68k/string.h
+++ b/include/asm-m68k/string.h
--- a/include/asm-m68k/sun3_pgalloc.h
+++ b/include/asm-m68k/sun3_pgalloc.h
--- a/include/asm-m68k/sun3mmu.h
+++ b/include/asm-m68k/sun3mmu.h
--- a/include/asm-m68k/sun3x.h
+++ b/include/asm-m68k/sun3x.h
--- a/include/asm-m68k/sun3xflop.h
+++ b/include/asm-m68k/sun3xflop.h
--- a/include/asm-m68k/termios.h
+++ b/include/asm-m68k/termios.h
--- a/include/asm-m68k/thread_info.h
+++ b/include/asm-m68k/thread_info.h
--- a/include/asm-m68k/tlbflush.h
+++ b/include/asm-m68k/tlbflush.h
--- a/include/asm-m68k/unaligned.h
+++ b/include/asm-m68k/unaligned.h
--- a/include/asm-m68k/user.h
+++ b/include/asm-m68k/user.h
--- a/include/asm-m68k/virtconvert.h
+++ b/include/asm-m68k/virtconvert.h