Merge branch 'from-linus' into bcm43xx

2026-09-24 18:16:04 +00:00 · 2006-08-02 14:15:21 -04:00 · 2006-08-02 14:15:21 -04:00 · ebf572b448
commit ebf572b448
parent 48c86da1a2 49b1e3ea19
202 changed files with 2399 additions and 1282 deletions
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
--- a/drivers/char/hw_random/geode-rng.c
+++ b/drivers/char/hw_random/geode-rng.c
--- a/drivers/char/hw_random/intel-rng.c
+++ b/drivers/char/hw_random/intel-rng.c
--- a/drivers/char/pc8736x_gpio.c
+++ b/drivers/char/pc8736x_gpio.c
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
--- 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/ide-iops.c
+++ b/drivers/ide/ide-iops.c
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
--- a/drivers/macintosh/therm_pm72.h
+++ b/drivers/macintosh/therm_pm72.h
--- a/drivers/macintosh/via-pmu-backlight.c
+++ b/drivers/macintosh/via-pmu-backlight.c
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
--- a/drivers/scsi/libata-eh.c
+++ b/drivers/scsi/libata-eh.c
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
--- a/drivers/video/fb_notify.c
+++ b/drivers/video/fb_notify.c
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c