Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2026-09-26 18:16:26 +00:00 · 2006-06-07 02:40:03 +00:00 · 2006-06-07 02:40:03 +00:00 · f3ffb68144
commit f3ffb68144
parent 5bafd76593 1def630a6a
135 changed files with 1047 additions and 696 deletions
--- a/Documentation/serial/driver
+++ b/Documentation/serial/driver
--- a/17
+++ b/17
--- a/4
+++ b/4
--- a/arch/alpha/kernel/alpha_ksyms.c
+++ b/arch/alpha/kernel/alpha_ksyms.c
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
--- a/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
--- a/arch/arm/mach-ixp23xx/core.c
+++ b/arch/arm/mach-ixp23xx/core.c
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
--- a/arch/mips/au1000/common/prom.c
+++ b/arch/mips/au1000/common/prom.c
--- a/arch/mips/au1000/common/sleeper.S
+++ b/arch/mips/au1000/common/sleeper.S
--- a/arch/mips/au1000/common/time.c
+++ b/arch/mips/au1000/common/time.c
--- a/arch/mips/ddb5xxx/ddb5476/dbg_io.c
+++ b/arch/mips/ddb5xxx/ddb5476/dbg_io.c
--- a/arch/mips/ddb5xxx/ddb5477/kgdb_io.c
+++ b/arch/mips/ddb5xxx/ddb5477/kgdb_io.c
--- a/arch/mips/gt64120/ev64120/serialGT.c
+++ b/arch/mips/gt64120/ev64120/serialGT.c
--- a/arch/mips/gt64120/momenco_ocelot/dbg_io.c
+++ b/arch/mips/gt64120/momenco_ocelot/dbg_io.c
--- a/arch/mips/ite-boards/generic/dbg_io.c
+++ b/arch/mips/ite-boards/generic/dbg_io.c
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
--- a/arch/mips/kernel/cpu-bugs64.c
+++ b/arch/mips/kernel/cpu-bugs64.c
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
--- a/arch/mips/kernel/gdb-low.S
+++ b/arch/mips/kernel/gdb-low.S
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
--- a/arch/mips/kernel/signal-common.h
+++ b/arch/mips/kernel/signal-common.h
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
--- a/arch/mips/math-emu/dp_fint.c
+++ b/arch/mips/math-emu/dp_fint.c
--- a/arch/mips/math-emu/dp_flong.c
+++ b/arch/mips/math-emu/dp_flong.c
--- a/arch/mips/math-emu/sp_fint.c
+++ b/arch/mips/math-emu/sp_fint.c
--- a/arch/mips/math-emu/sp_flong.c
+++ b/arch/mips/math-emu/sp_flong.c
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
--- a/arch/mips/mm/pg-r4k.c
+++ b/arch/mips/mm/pg-r4k.c
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
--- a/arch/mips/momentum/jaguar_atx/dbg_io.c
+++ b/arch/mips/momentum/jaguar_atx/dbg_io.c
--- a/arch/mips/momentum/ocelot_c/dbg_io.c
+++ b/arch/mips/momentum/ocelot_c/dbg_io.c
--- a/arch/mips/momentum/ocelot_g/dbg_io.c
+++ b/arch/mips/momentum/ocelot_g/dbg_io.c
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
--- a/arch/mips/oprofile/op_model_rm9000.c
+++ b/arch/mips/oprofile/op_model_rm9000.c
--- a/arch/mips/sgi-ip32/ip32-irq.c
+++ b/arch/mips/sgi-ip32/ip32-irq.c
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
--- a/arch/sparc64/lib/checksum.S
+++ b/arch/sparc64/lib/checksum.S
--- a/arch/sparc64/lib/csum_copy.S
+++ b/arch/sparc64/lib/csum_copy.S
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
--- a/arch/um/include/kern_util.h
+++ b/arch/um/include/kern_util.h
--- a/arch/um/kernel/time_kern.c
+++ b/arch/um/kernel/time_kern.c
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
--- a/arch/um/os-Linux/time.c
+++ b/arch/um/os-Linux/time.c
--- a/arch/um/sys-i386/syscalls.c
+++ b/arch/um/sys-i386/syscalls.c
--- a/arch/um/sys-x86_64/signal.c
+++ b/arch/um/sys-x86_64/signal.c
--- a/arch/um/sys-x86_64/syscalls.c
+++ b/arch/um/sys-x86_64/syscalls.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
--- a/drivers/char/tpm/tpm_bios.c
+++ b/drivers/char/tpm/tpm_bios.c
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
--- a/drivers/rtc/rtc-m48t86.c
+++ b/drivers/rtc/rtc-m48t86.c
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
--- a/drivers/video/maxinefb.c
+++ b/drivers/video/maxinefb.c
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
--- a/fs/namei.c
+++ b/fs/namei.c
--- a/include/asm-alpha/smp.h
+++ b/include/asm-alpha/smp.h
--- a/include/asm-arm/arch-ixp23xx/memory.h
+++ b/include/asm-arm/arch-ixp23xx/memory.h
--- a/include/asm-arm/arch-l7200/serial_l7200.h
+++ b/include/asm-arm/arch-l7200/serial_l7200.h
--- a/Show more
+++ b/Show more