Merge /spare/repo/linux-2.6/

2026-11-13 07:31:07 +00:00 · 2005-10-04 10:16:31 -04:00 · 2005-10-04 10:16:31 -04:00 · 2ee73cc2d5
commit 2ee73cc2d5
parent c1d9728ecc ed39f731ab
491 changed files with 19952 additions and 5619 deletions
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
--- a/drivers/char/drm/drm_proc.c
+++ b/drivers/char/drm/drm_proc.c
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
--- a/drivers/char/n_r3964.c
+++ b/drivers/char/n_r3964.c
--- a/drivers/char/watchdog/mv64x60_wdt.c
+++ b/drivers/char/watchdog/mv64x60_wdt.c
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
--- a/drivers/ieee1394/amdtp.c
+++ b/drivers/ieee1394/amdtp.c
--- a/drivers/ieee1394/csr1212.h
+++ b/drivers/ieee1394/csr1212.h
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
--- a/drivers/ieee1394/eth1394.h
+++ b/drivers/ieee1394/eth1394.h
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
--- a/drivers/ieee1394/hosts.h
+++ b/drivers/ieee1394/hosts.h
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
--- a/drivers/infiniband/core/uverbs.h
+++ b/drivers/infiniband/core/uverbs.h
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
--- a/drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/drivers/infiniband/hw/mthca/mthca_eq.c
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
--- a/drivers/isdn/divert/divert_procfs.c
+++ b/drivers/isdn/divert/divert_procfs.c
--- a/drivers/isdn/hardware/eicon/diva_didd.c
+++ b/drivers/isdn/hardware/eicon/diva_didd.c
--- a/drivers/isdn/hardware/eicon/divasproc.c
+++ b/drivers/isdn/hardware/eicon/divasproc.c
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
--- a/drivers/media/video/rds.h
+++ b/drivers/media/video/rds.h
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
--- a/drivers/net/cassini.h
+++ b/drivers/net/cassini.h
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
--- a/drivers/net/wan/sdlamain.c
+++ b/drivers/net/wan/sdlamain.c
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
--- a/drivers/pcmcia/ti113x.h
+++ b/drivers/pcmcia/ti113x.h
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
--- a/drivers/scsi/3w-9xxx.h
+++ b/drivers/scsi/3w-9xxx.h
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
--- a/drivers/scsi/aic7xxx/aic7770_osm.c
+++ b/drivers/scsi/aic7xxx/aic7770_osm.c
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
--- a/drivers/scsi/megaraid/Kconfig.megaraid
+++ b/drivers/scsi/megaraid/Kconfig.megaraid
--- a/drivers/scsi/megaraid/Makefile
+++ b/drivers/scsi/megaraid/Makefile
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
--- a/drivers/scsi/qla2xxx/qla_rscn.c
+++ b/drivers/scsi/qla2xxx/qla_rscn.c
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
--- a/Show more
+++ b/Show more