Automatic merge of /spare/repo/linux-2.6/.git branch HEAD

2026-09-14 18:22:56 +00:00 · 2005-06-02 18:43:09 -04:00 · 2005-06-02 18:43:09 -04:00 · d7aaf48128
commit d7aaf48128
parent decc6d0b68 1e86d1c648
194 changed files with 4593 additions and 1698 deletions
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
--- a/drivers/firmware/pcdp.c
+++ b/drivers/firmware/pcdp.c
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
--- a/drivers/input/gameport/Kconfig
+++ b/drivers/input/gameport/Kconfig
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
--- a/drivers/input/touchscreen/gunze.c
+++ b/drivers/input/touchscreen/gunze.c
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/pci/hotplug/cpci_hotplug_core.c
+++ b/drivers/pci/hotplug/cpci_hotplug_core.c
--- a/drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
--- a/drivers/pci/hotplug/shpchprm_acpi.c
+++ b/drivers/pci/hotplug/shpchprm_acpi.c
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
--- a/drivers/usb/media/pwc/pwc-ctrl.c
+++ b/drivers/usb/media/pwc/pwc-ctrl.c
--- a/drivers/usb/media/pwc/pwc-uncompress.c
+++ b/drivers/usb/media/pwc/pwc-uncompress.c
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c