Merge branch 'master'

2026-09-26 18:16:26 +00:00 · 2005-10-27 20:56:43 -04:00 · 2005-10-27 20:56:43 -04:00 · cb650116a0
commit cb650116a0
parent 7bbaa75452 741b2252a5
48 changed files with 614 additions and 413 deletions
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/2
+++ b/2
--- a/arch/arm/mach-pxa/corgi_lcd.c
+++ b/arch/arm/mach-pxa/corgi_lcd.c
--- a/arch/ppc64/kernel/mpic.c
+++ b/arch/ppc64/kernel/mpic.c
--- a/arch/um/include/sysdep-i386/thread.h
+++ b/arch/um/include/sysdep-i386/thread.h
--- a/arch/um/include/sysdep-x86_64/thread.h
+++ b/arch/um/include/sysdep-x86_64/thread.h
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
--- a/drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/drivers/infiniband/hw/mthca/mthca_eq.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.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_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
--- a/fs/aio.c
+++ b/fs/aio.c
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
--- a/fs/inotify.c
+++ b/fs/inotify.c
--- a/include/asm-alpha/atomic.h
+++ b/include/asm-alpha/atomic.h
--- a/include/asm-alpha/barrier.h
+++ b/include/asm-alpha/barrier.h
--- a/include/asm-alpha/system.h
+++ b/include/asm-alpha/system.h
--- a/include/asm-arm/bitops.h
+++ b/include/asm-arm/bitops.h
--- a/include/asm-x86_64/pci.h
+++ b/include/asm-x86_64/pci.h
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
--- a/include/net/llc_pdu.h
+++ b/include/net/llc_pdu.h
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/lib/idr.c
+++ b/lib/idr.c
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
--- a/net/802/tr.c
+++ b/net/802/tr.c
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
--- a/net/core/wireless.c
+++ b/net/core/wireless.c
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
--- a/sound/core/init.c
+++ b/sound/core/init.c