Merge /spare/repo/netdev-2.6 branch 'ieee80211'

2026-09-14 18:22:56 +00:00 · 2005-06-30 00:49:38 -04:00 · 2005-06-30 00:49:38 -04:00 · e9dd256179
commit e9dd256179
parent d011e151bc 0c16877570
309 changed files with 4401 additions and 4635 deletions
--- a/Documentation/DocBook/libata.tmpl
+++ b/Documentation/DocBook/libata.tmpl
--- a/Documentation/SubmittingDrivers
+++ b/Documentation/SubmittingDrivers
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/serial/driver
+++ b/Documentation/serial/driver
--- a/Documentation/video4linux/API.html
+++ b/Documentation/video4linux/API.html
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
--- a/Documentation/video4linux/README.saa7134
+++ b/Documentation/video4linux/README.saa7134
--- a/15
+++ b/15
--- a/4
+++ b/4
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
--- a/arch/arm/lib/longlong.h
+++ b/arch/arm/lib/longlong.h
--- a/arch/arm/lib/udivdi3.c
+++ b/arch/arm/lib/udivdi3.c
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
--- a/arch/arm/mach-omap/pm.c
+++ b/arch/arm/mach-omap/pm.c
--- a/arch/arm/mach-omap/time.c
+++ b/arch/arm/mach-omap/time.c
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
--- a/arch/arm/mach-s3c2410/devs.c
+++ b/arch/arm/mach-s3c2410/devs.c
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
--- a/arch/arm/mach-s3c2410/pm-simtec.c
+++ b/arch/arm/mach-s3c2410/pm-simtec.c
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
--- a/arch/arm/oprofile/Makefile
+++ b/arch/arm/oprofile/Makefile
--- a/arch/arm/oprofile/backtrace.c
+++ b/arch/arm/oprofile/backtrace.c
--- a/arch/arm/oprofile/init.c
+++ b/arch/arm/oprofile/init.c
--- a/arch/arm/oprofile/op_arm_model.h
+++ b/arch/arm/oprofile/op_arm_model.h
--- a/arch/arm/vfp/vfp.h
+++ b/arch/arm/vfp/vfp.h
--- a/arch/arm/vfp/vfpdouble.c
+++ b/arch/arm/vfp/vfpdouble.c
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
--- a/arch/arm/vfp/vfpsingle.c
+++ b/arch/arm/vfp/vfpsingle.c
--- a/arch/i386/boot/tools/build.c
+++ b/arch/i386/boot/tools/build.c
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
--- a/arch/i386/pci/legacy.c
+++ b/arch/i386/pci/legacy.c
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
--- a/arch/i386/pci/numa.c
+++ b/arch/i386/pci/numa.c
--- a/arch/i386/pci/pci.h
+++ b/arch/i386/pci/pci.h
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
--- a/arch/ia64/kernel/gate.S
+++ b/arch/ia64/kernel/gate.S
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
--- a/arch/ia64/sn/kernel/iomv.c
+++ b/arch/ia64/sn/kernel/iomv.c
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
--- a/arch/ia64/sn/kernel/sn2/ptc_deadlock.S
+++ b/arch/ia64/sn/kernel/sn2/ptc_deadlock.S
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
--- a/arch/parisc/configs/712_defconfig
+++ b/arch/parisc/configs/712_defconfig
--- a/arch/parisc/configs/a500_defconfig
+++ b/arch/parisc/configs/a500_defconfig
--- a/arch/parisc/configs/b180_defconfig
+++ b/arch/parisc/configs/b180_defconfig
--- a/arch/parisc/configs/c3000_defconfig
+++ b/arch/parisc/configs/c3000_defconfig
--- a/arch/parisc/defconfig
+++ b/arch/parisc/defconfig
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
--- a/arch/ppc64/kernel/irq.c
+++ b/arch/ppc64/kernel/irq.c
--- a/arch/ppc64/kernel/pci.c
+++ b/arch/ppc64/kernel/pci.c
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/char/rio/rio_linux.c
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.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/char/watchdog/ixp2000_wdt.c
+++ b/drivers/char/watchdog/ixp2000_wdt.c
--- a/drivers/char/watchdog/ixp4xx_wdt.c
+++ b/drivers/char/watchdog/ixp4xx_wdt.c
--- a/drivers/firmware/pcdp.c
+++ b/drivers/firmware/pcdp.c
--- a/drivers/firmware/pcdp.h
+++ b/drivers/firmware/pcdp.h
--- a/Show more
+++ b/Show more