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

Signed-off-by: Steve French <sfrench@us.ibm.com>
2026-09-14 18:22:56 +00:00 · 2006-01-12 14:47:08 -08:00 · 2006-01-12 14:47:08 -08:00 · 94bc2be31a
commit 94bc2be31a
parent c32a0b689c 58cba4650a
4804 changed files with 270341 additions and 131239 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/3
+++ b/3
--- a/Documentation/Changes
+++ b/Documentation/Changes
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
--- a/Documentation/DocBook/.gitignore
+++ b/Documentation/DocBook/.gitignore
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/DocBook/kernel-locking.tmpl
+++ b/Documentation/DocBook/kernel-locking.tmpl
--- a/Documentation/DocBook/usb.tmpl
+++ b/Documentation/DocBook/usb.tmpl
--- a/Documentation/RCU/rcuref.txt
+++ b/Documentation/RCU/rcuref.txt
--- a/Documentation/SubmittingDrivers
+++ b/Documentation/SubmittingDrivers
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/applying-patches.txt
+++ b/Documentation/applying-patches.txt
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
--- a/Documentation/block/stat.txt
+++ b/Documentation/block/stat.txt
--- a/Documentation/cpu-freq/governors.txt
+++ b/Documentation/cpu-freq/governors.txt
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
--- a/Documentation/cpusets.txt
+++ b/Documentation/cpusets.txt
--- a/Documentation/dvb/avermedia.txt
+++ b/Documentation/dvb/avermedia.txt
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
--- a/Documentation/dvb/ttusb-dec.txt
+++ b/Documentation/dvb/ttusb-dec.txt
--- a/Documentation/fb/cyblafb/bugs
+++ b/Documentation/fb/cyblafb/bugs
--- a/Documentation/fb/cyblafb/fb.modes
+++ b/Documentation/fb/cyblafb/fb.modes
--- a/Documentation/fb/cyblafb/performance
+++ b/Documentation/fb/cyblafb/performance
--- a/Documentation/fb/cyblafb/todo
+++ b/Documentation/fb/cyblafb/todo
--- a/Documentation/fb/cyblafb/usage
+++ b/Documentation/fb/cyblafb/usage
--- a/Documentation/fb/cyblafb/whatsnew
+++ b/Documentation/fb/cyblafb/whatsnew
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
--- a/Documentation/filesystems/configfs/configfs.txt
+++ b/Documentation/filesystems/configfs/configfs.txt
--- a/Documentation/filesystems/configfs/configfs_example.c
+++ b/Documentation/filesystems/configfs/configfs_example.c
--- a/Documentation/filesystems/dlmfs.txt
+++ b/Documentation/filesystems/dlmfs.txt
--- a/Documentation/filesystems/ext3.txt
+++ b/Documentation/filesystems/ext3.txt
--- a/Documentation/filesystems/ocfs2.txt
+++ b/Documentation/filesystems/ocfs2.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/ramfs-rootfs-initramfs.txt
+++ b/Documentation/filesystems/ramfs-rootfs-initramfs.txt
--- a/Documentation/filesystems/relayfs.txt
+++ b/Documentation/filesystems/relayfs.txt
--- a/Documentation/filesystems/spufs.txt
+++ b/Documentation/filesystems/spufs.txt
--- a/Documentation/filesystems/sysfs-pci.txt
+++ b/Documentation/filesystems/sysfs-pci.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/Documentation/hrtimers.txt
+++ b/Documentation/hrtimers.txt
--- a/Documentation/hwmon/w83627hf
+++ b/Documentation/hwmon/w83627hf
--- a/Documentation/i2c/busses/i2c-nforce2
+++ b/Documentation/i2c/busses/i2c-nforce2
--- a/Documentation/i2c/busses/i2c-parport
+++ b/Documentation/i2c/busses/i2c-parport
--- a/Documentation/i2c/porting-clients
+++ b/Documentation/i2c/porting-clients
--- a/Documentation/i2c/writing-clients
+++ b/Documentation/i2c/writing-clients
--- a/Documentation/i2o/ioctl
+++ b/Documentation/i2o/ioctl
--- a/Documentation/input/appletouch.txt
+++ b/Documentation/input/appletouch.txt
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
--- a/Documentation/kbuild/modules.txt
+++ b/Documentation/kbuild/modules.txt
--- a/Documentation/kdump/gdbmacros.txt
+++ b/Documentation/kdump/gdbmacros.txt
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/keys-request-key.txt
+++ b/Documentation/keys-request-key.txt
--- a/Documentation/keys.txt
+++ b/Documentation/keys.txt
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
--- a/Documentation/laptop-mode.txt
+++ b/Documentation/laptop-mode.txt
--- a/Documentation/locks.txt
+++ b/Documentation/locks.txt
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
--- a/Documentation/mutex-design.txt
+++ b/Documentation/mutex-design.txt
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
--- a/Documentation/networking/gianfar.txt
+++ b/Documentation/networking/gianfar.txt
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/Documentation/networking/sk98lin.txt
+++ b/Documentation/networking/sk98lin.txt
--- a/Documentation/oops-tracing.txt
+++ b/Documentation/oops-tracing.txt
--- a/Documentation/pci-error-recovery.txt
+++ b/Documentation/pci-error-recovery.txt
--- a/Documentation/pcmcia/driver-changes.txt
+++ b/Documentation/pcmcia/driver-changes.txt
--- a/Documentation/pm.txt
+++ b/Documentation/pm.txt
--- a/Documentation/power/interface.txt
+++ b/Documentation/power/interface.txt
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
--- a/Documentation/powerpc/00-INDEX
+++ b/Documentation/powerpc/00-INDEX
--- a/Documentation/powerpc/eeh-pci-error-recovery.txt
+++ b/Documentation/powerpc/eeh-pci-error-recovery.txt
--- a/Documentation/scsi/ChangeLog.megaraid
+++ b/Documentation/scsi/ChangeLog.megaraid
--- a/Documentation/scsi/scsi_mid_low_api.txt
+++ b/Documentation/scsi/scsi_mid_low_api.txt
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
--- a/Documentation/sound/alsa/Procfile.txt
+++ b/Documentation/sound/alsa/Procfile.txt
--- a/Documentation/sound/alsa/hda_codec.txt
+++ b/Documentation/sound/alsa/hda_codec.txt
--- a/Documentation/stable_kernel_rules.txt
+++ b/Documentation/stable_kernel_rules.txt
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
--- a/Documentation/x86_64/cpu-hotplug-spec
+++ b/Documentation/x86_64/cpu-hotplug-spec
--- a/5
+++ b/5
--- a/91
+++ b/91
--- a/131
+++ b/131
--- a/7
+++ b/7
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/alpha/kernel/alpha_ksyms.c
+++ b/arch/alpha/kernel/alpha_ksyms.c
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
--- a/arch/alpha/kernel/pci-noop.c
+++ b/arch/alpha/kernel/pci-noop.c
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
--- a/arch/alpha/kernel/ptrace.c
+++ b/arch/alpha/kernel/ptrace.c
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
--- a/arch/alpha/kernel/sys_sio.c
+++ b/arch/alpha/kernel/sys_sio.c
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
--- a/Show more
+++ b/Show more