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

Signed-off-by: Steve French <sfrench@us.ibm.com>
2026-09-26 18:16:26 +00:00 · 2006-03-07 21:47:30 +00:00 · 2006-03-07 21:47:30 +00:00 · f6e77c9479
commit f6e77c9479
parent beb84dc818 d0b004840b
59 changed files with 430 additions and 239 deletions
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
--- a/arch/sparc64/kernel/sys32.S
+++ b/arch/sparc64/kernel/sys32.S
--- a/arch/sparc64/kernel/una_asm.S
+++ b/arch/sparc64/kernel/una_asm.S
--- a/arch/sparc64/lib/U1copy_from_user.S
+++ b/arch/sparc64/lib/U1copy_from_user.S
--- a/arch/sparc64/lib/U1copy_to_user.S
+++ b/arch/sparc64/lib/U1copy_to_user.S
--- a/arch/sparc64/lib/U3copy_from_user.S
+++ b/arch/sparc64/lib/U3copy_from_user.S
--- a/arch/sparc64/lib/U3copy_to_user.S
+++ b/arch/sparc64/lib/U3copy_to_user.S
--- a/arch/sparc64/lib/bzero.S
+++ b/arch/sparc64/lib/bzero.S
--- a/arch/sparc64/lib/copy_in_user.S
+++ b/arch/sparc64/lib/copy_in_user.S
--- a/arch/sparc64/lib/csum_copy_from_user.S
+++ b/arch/sparc64/lib/csum_copy_from_user.S
--- a/arch/sparc64/lib/csum_copy_to_user.S
+++ b/arch/sparc64/lib/csum_copy_to_user.S
--- a/arch/sparc64/lib/strlen_user.S
+++ b/arch/sparc64/lib/strlen_user.S
--- a/arch/sparc64/lib/strncpy_from_user.S
+++ b/arch/sparc64/lib/strncpy_from_user.S
--- a/arch/sparc64/solaris/entry64.S
+++ b/arch/sparc64/solaris/entry64.S
--- a/arch/v850/kernel/process.c
+++ b/arch/v850/kernel/process.c
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
--- a/drivers/char/hw_random.c
+++ b/drivers/char/hw_random.c
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
--- a/drivers/macintosh/windfarm_pid.c
+++ b/drivers/macintosh/windfarm_pid.c
--- a/drivers/mmc/au1xmmc.c
+++ b/drivers/mmc/au1xmmc.c
--- a/drivers/net/chelsio/espi.c
+++ b/drivers/net/chelsio/espi.c
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
--- a/fs/fifo.c
+++ b/fs/fifo.c
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
--- a/include/asm-s390/system.h
+++ b/include/asm-s390/system.h
--- a/include/asm-sparc64/futex.h
+++ b/include/asm-sparc64/futex.h
--- a/include/asm-sparc64/uaccess.h
+++ b/include/asm-sparc64/uaccess.h
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
--- a/include/linux/kmalloc_sizes.h
+++ b/include/linux/kmalloc_sizes.h
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/timer.c
+++ b/kernel/timer.c
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
--- a/mm/slab.c
+++ b/mm/slab.c
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
--- a/sound/core/control.c
+++ b/sound/core/control.c