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

2026-09-16 18:15:52 +00:00 · 2005-12-16 17:10:35 -05:00 · 2005-12-16 17:10:35 -05:00 · 16e842a62a
commit 16e842a62a
parent 525352eb6d 42245e65f3
117 changed files with 1264 additions and 1513 deletions
--- a/4
+++ b/4
--- a/arch/alpha/kernel/machvec_impl.h
+++ b/arch/alpha/kernel/machvec_impl.h
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
--- a/arch/i386/mm/ioremap.c
+++ b/arch/i386/mm/ioremap.c
--- a/arch/i386/pci/direct.c
+++ b/arch/i386/pci/direct.c
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
--- a/arch/i386/pci/pci.h
+++ b/arch/i386/pci/pci.h
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
--- a/arch/ia64/sn/pci/pcibr/pcibr_reg.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_reg.c
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
--- a/arch/sparc/kernel/ebus.c
+++ b/arch/sparc/kernel/ebus.c
--- a/arch/sparc/kernel/led.c
+++ b/arch/sparc/kernel/led.c
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
--- a/arch/x86_64/ia32/ia32_binfmt.c
+++ b/arch/x86_64/ia32/ia32_binfmt.c
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
--- a/arch/x86_64/mm/ioremap.c
+++ b/arch/x86_64/mm/ioremap.c
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
--- a/drivers/char/mwave/mwavepub.h
+++ b/drivers/char/mwave/mwavepub.h
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
--- a/drivers/char/watchdog/booke_wdt.c
+++ b/drivers/char/watchdog/booke_wdt.c
--- a/drivers/char/watchdog/wdrtas.c
+++ b/drivers/char/watchdog/wdrtas.c
--- a/drivers/firmware/dell_rbu.c
+++ b/drivers/firmware/dell_rbu.c
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
--- a/drivers/ide/ide-cd.h
+++ b/drivers/ide/ide-cd.h
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
--- a/drivers/ide/mips/Makefile
+++ b/drivers/ide/mips/Makefile
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
--- a/drivers/sbus/char/vfc.h
+++ b/drivers/sbus/char/vfc.h
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
--- a/drivers/scsi/ibmvscsi/ibmvscsi.h
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.h
--- a/drivers/scsi/ibmvscsi/iseries_vscsi.c
+++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c
--- a/drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
--- a/drivers/video/cfbcopyarea.c
+++ b/drivers/video/cfbcopyarea.c
--- a/drivers/video/cfbfillrect.c
+++ b/drivers/video/cfbfillrect.c
--- a/drivers/video/cfbimgblt.c
+++ b/drivers/video/cfbimgblt.c
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
--- a/include/asm-arm/elf.h
+++ b/include/asm-arm/elf.h
--- a/include/asm-ia64/sal.h
+++ b/include/asm-ia64/sal.h
--- a/include/asm-mips/mach-au1x00/au1xxx_ide.h
+++ b/include/asm-mips/mach-au1x00/au1xxx_ide.h
--- a/include/asm-sparc/memreg.h
+++ b/include/asm-sparc/memreg.h
--- a/include/asm-sparc/pcic.h
+++ b/include/asm-sparc/pcic.h
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/Show more
+++ b/Show more