Merge /spare/repo/linux-2.6 into upstream

2026-09-26 18:16:26 +00:00 · 2006-08-29 17:55:59 -04:00 · 2006-08-29 17:55:59 -04:00 · b01e86fee6
commit b01e86fee6
parent e889173c2c 60d4684068
300 changed files with 14311 additions and 4956 deletions
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
--- a/drivers/acpi/hotkey.c
+++ b/drivers/acpi/hotkey.c
--- a/drivers/acpi/i2c_ec.c
+++ b/drivers/acpi/i2c_ec.c
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
--- a/drivers/cdrom/gscd.c
+++ b/drivers/cdrom/gscd.c
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
--- a/drivers/hwmon/abituguru.c
+++ b/drivers/hwmon/abituguru.c
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
--- a/drivers/infiniband/hw/mthca/mthca_provider.h
+++ b/drivers/infiniband/hw/mthca/mthca_provider.h
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/e2100.c
+++ b/drivers/net/e2100.c
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
--- a/drivers/net/es3210.c
+++ b/drivers/net/es3210.c
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
--- a/drivers/net/fs_enet/Makefile
+++ b/drivers/net/fs_enet/Makefile
--- a/drivers/net/fs_enet/fec.h
+++ b/drivers/net/fs_enet/fec.h
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
--- a/drivers/net/fs_enet/fs_enet-mii.c
+++ b/drivers/net/fs_enet/fs_enet-mii.c
--- a/drivers/net/fs_enet/fs_enet.h
+++ b/drivers/net/fs_enet/fs_enet.h
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/fs_enet/mii-bitbang.c
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
--- a/drivers/net/fs_enet/mii-fixed.c
+++ b/drivers/net/fs_enet/mii-fixed.c
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
--- a/drivers/net/lne390.c
+++ b/drivers/net/lne390.c
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
--- a/drivers/net/seeq8005.c
+++ b/drivers/net/seeq8005.c
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
--- a/drivers/net/spider_net_ethtool.c
+++ b/drivers/net/spider_net_ethtool.c
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
--- a/drivers/net/ucc_geth_phy.c
+++ b/drivers/net/ucc_geth_phy.c
--- a/drivers/net/ucc_geth_phy.h
+++ b/drivers/net/ucc_geth_phy.h
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
--- a/drivers/net/wan/c101.c
+++ b/drivers/net/wan/c101.c
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
--- a/Show more
+++ b/Show more