Merge branch 'master' of /home/aia21/ntfs-2.6/

2026-09-16 18:15:52 +00:00 · 2006-03-23 17:05:47 +00:00 · 2006-03-23 17:05:47 +00:00 · a05ba4561f
commit a05ba4561f
parent 7429375900 b0e6e96299
320 changed files with 6374 additions and 4846 deletions
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
--- a/Documentation/power/userland-swsusp.txt
+++ b/Documentation/power/userland-swsusp.txt
--- a/Documentation/power/video.txt
+++ b/Documentation/power/video.txt
--- a/arch/cris/kernel/irq.c
+++ b/arch/cris/kernel/irq.c
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
--- a/arch/i386/Kconfig.debug
+++ b/arch/i386/Kconfig.debug
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
--- a/arch/i386/kernel/alternative.c
+++ b/arch/i386/kernel/alternative.c
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
--- a/arch/i386/kernel/cpu/centaur.c
+++ b/arch/i386/kernel/cpu/centaur.c
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
--- a/arch/i386/kernel/cpu/intel.c
+++ b/arch/i386/kernel/cpu/intel.c
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/arch/i386/kernel/cpu/intel_cacheinfo.c
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/i386/kernel/cpu/proc.c
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/i386/kernel/kprobes.c
--- a/arch/i386/kernel/module.c
+++ b/arch/i386/kernel/module.c
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
--- a/arch/i386/kernel/semaphore.c
+++ b/arch/i386/kernel/semaphore.c
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
--- a/arch/i386/kernel/topology.c
+++ b/arch/i386/kernel/topology.c
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
--- a/arch/i386/kernel/vmlinux.lds.S
+++ b/arch/i386/kernel/vmlinux.lds.S
--- a/arch/i386/kernel/vsyscall-sysenter.S
+++ b/arch/i386/kernel/vsyscall-sysenter.S
--- a/arch/i386/mach-es7000/es7000.h
+++ b/arch/i386/mach-es7000/es7000.h
--- a/arch/i386/mach-es7000/es7000plat.c
+++ b/arch/i386/mach-es7000/es7000plat.c
--- a/arch/i386/mm/fault.c
+++ b/arch/i386/mm/fault.c
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
--- a/arch/i386/oprofile/nmi_int.c
+++ b/arch/i386/oprofile/nmi_int.c
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
--- a/arch/m32r/kernel/irq.c
+++ b/arch/m32r/kernel/irq.c
--- a/arch/m68k/bvme6000/rtc.c
+++ b/arch/m68k/bvme6000/rtc.c
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
--- a/arch/sh64/kernel/irq.c
+++ b/arch/sh64/kernel/irq.c
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
--- a/arch/sparc/kernel/smp.c
+++ b/arch/sparc/kernel/smp.c
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
--- a/arch/x86_64/kernel/early_printk.c
+++ b/arch/x86_64/kernel/early_printk.c
--- a/arch/x86_64/kernel/irq.c
+++ b/arch/x86_64/kernel/irq.c
--- a/arch/x86_64/kernel/kprobes.c
+++ b/arch/x86_64/kernel/kprobes.c
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
--- a/arch/x86_64/kernel/signal.c
+++ b/arch/x86_64/kernel/signal.c
--- a/arch/xtensa/kernel/irq.c
+++ b/arch/xtensa/kernel/irq.c
--- a/arch/xtensa/platform-iss/console.c
+++ b/arch/xtensa/platform-iss/console.c
--- a/block/ioctl.c
+++ b/block/ioctl.c
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
--- a/drivers/char/generic_serial.c
+++ b/drivers/char/generic_serial.c
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
--- a/drivers/char/nwflash.c
+++ b/drivers/char/nwflash.c
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
--- a/drivers/char/ser_a2232.c
+++ b/drivers/char/ser_a2232.c
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
--- a/drivers/char/snsc_event.c
+++ b/drivers/char/snsc_event.c
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
--- a/drivers/char/vme_scc.c
+++ b/drivers/char/vme_scc.c
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
--- a/Show more
+++ b/Show more