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

2026-09-16 18:15:52 +00:00 · 2005-06-27 22:50:10 -04:00 · 2005-06-27 22:50:10 -04:00 · aa8f6dfd35
commit aa8f6dfd35
parent f45727d52d 245ac8738b
322 changed files with 19222 additions and 15261 deletions
--- a/Documentation/block/ioprio.txt
+++ b/Documentation/block/ioprio.txt
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/2
+++ b/2
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
--- a/arch/arm/mach-aaec2000/Makefile.boot
+++ b/arch/arm/mach-aaec2000/Makefile.boot
--- a/arch/arm/mach-omap/usb.c
+++ b/arch/arm/mach-omap/usb.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/tools/mach-types
+++ b/arch/arm/tools/mach-types
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/i386/kernel/kprobes.c
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/i386/kernel/syscall_table.S
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
--- a/arch/ppc/platforms/pmac_sleep.S
+++ b/arch/ppc/platforms/pmac_sleep.S
--- a/arch/ppc/platforms/pmac_time.c
+++ b/arch/ppc/platforms/pmac_time.c
--- a/arch/ppc/platforms/sandpoint.c
+++ b/arch/ppc/platforms/sandpoint.c
--- a/arch/ppc/syslib/open_pic.c
+++ b/arch/ppc/syslib/open_pic.c
--- a/arch/ppc64/kernel/kprobes.c
+++ b/arch/ppc64/kernel/kprobes.c
--- a/arch/ppc64/kernel/ppc_ksyms.c
+++ b/arch/ppc64/kernel/ppc_ksyms.c
--- a/arch/ppc64/kernel/process.c
+++ b/arch/ppc64/kernel/process.c
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
--- a/arch/x86_64/kernel/kprobes.c
+++ b/arch/x86_64/kernel/kprobes.c
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
--- a/drivers/block/as-iosched.c
+++ b/drivers/block/as-iosched.c
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/block/cfq-iosched.c
+++ b/drivers/block/cfq-iosched.c
--- a/drivers/block/deadline-iosched.c
+++ b/drivers/block/deadline-iosched.c
--- a/drivers/block/elevator.c
+++ b/drivers/block/elevator.c
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
--- a/drivers/infiniband/core/packer.c
+++ b/drivers/infiniband/core/packer.c
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
--- a/drivers/infiniband/hw/mthca/mthca_av.c
+++ b/drivers/infiniband/hw/mthca/mthca_av.c
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
--- a/drivers/infiniband/hw/mthca/mthca_cmd.h
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.h
--- a/drivers/infiniband/hw/mthca/mthca_cq.c
+++ b/drivers/infiniband/hw/mthca/mthca_cq.c
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
--- a/drivers/infiniband/hw/mthca/mthca_doorbell.h
+++ b/drivers/infiniband/hw/mthca/mthca_doorbell.h
--- a/drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/drivers/infiniband/hw/mthca/mthca_eq.c
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
--- a/drivers/infiniband/hw/mthca/mthca_mcg.c
+++ b/drivers/infiniband/hw/mthca/mthca_mcg.c
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
--- a/drivers/infiniband/hw/mthca/mthca_mr.c
+++ b/drivers/infiniband/hw/mthca/mthca_mr.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/input/evdev.c
+++ b/drivers/input/evdev.c
--- a/drivers/input/gameport/Kconfig
+++ b/drivers/input/gameport/Kconfig
--- a/drivers/input/gameport/Makefile
+++ b/drivers/input/gameport/Makefile
--- a/drivers/input/gameport/cs461x.c
+++ b/drivers/input/gameport/cs461x.c
--- a/drivers/input/gameport/ns558.c
+++ b/drivers/input/gameport/ns558.c
--- a/drivers/input/gameport/vortex.c
+++ b/drivers/input/gameport/vortex.c
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
--- a/drivers/input/joystick/amijoy.c
+++ b/drivers/input/joystick/amijoy.c
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
--- a/drivers/input/joystick/spaceball.c
+++ b/drivers/input/joystick/spaceball.c
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
--- a/drivers/input/keyboard/lkkbd.c
+++ b/drivers/input/keyboard/lkkbd.c
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
--- a/drivers/input/keyboard/maple_keyb.c
+++ b/drivers/input/keyboard/maple_keyb.c
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
--- a/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
--- a/drivers/input/mouse/amimouse.c
+++ b/drivers/input/mouse/amimouse.c
--- a/drivers/input/mouse/inport.c
+++ b/drivers/input/mouse/inport.c
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
--- a/drivers/input/mouse/lifebook.h
+++ b/drivers/input/mouse/lifebook.h
--- a/drivers/input/mouse/logibm.c
+++ b/drivers/input/mouse/logibm.c
--- a/drivers/input/mouse/maplemouse.c
+++ b/drivers/input/mouse/maplemouse.c
--- a/drivers/input/mouse/pc110pad.c
+++ b/drivers/input/mouse/pc110pad.c
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
--- a/drivers/input/mouse/rpcmouse.c
+++ b/drivers/input/mouse/rpcmouse.c
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
--- a/drivers/input/serio/libps2.c
+++ b/drivers/input/serio/libps2.c
--- a/Show more
+++ b/Show more