Merge branch 'master' into gfs2

2026-09-18 18:15:59 +00:00 · 2006-09-28 08:29:59 -04:00 · 2006-09-28 08:29:59 -04:00 · 185a257f2f
commit 185a257f2f
parent 3f1a9aaeff a77c64c1a6
1957 changed files with 89929 additions and 35482 deletions
--- a/Documentation/ABI/obsolete/devfs
+++ b/Documentation/ABI/obsolete/devfs
--- a/Documentation/ABI/testing/sysfs-power
+++ b/Documentation/ABI/testing/sysfs-power
--- a/Documentation/DocBook/usb.tmpl
+++ b/Documentation/DocBook/usb.tmpl
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/i2c/busses/i2c-viapro
+++ b/Documentation/i2c/busses/i2c-viapro
--- a/Documentation/i2c/i2c-stub
+++ b/Documentation/i2c/i2c-stub
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
--- a/Documentation/networking/dccp.txt
+++ b/Documentation/networking/dccp.txt
--- a/Documentation/nommu-mmap.txt
+++ b/Documentation/nommu-mmap.txt
--- a/Documentation/pcieaer-howto.txt
+++ b/Documentation/pcieaer-howto.txt
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
--- a/Documentation/power/interface.txt
+++ b/Documentation/power/interface.txt
--- a/Documentation/sh/new-machine.txt
+++ b/Documentation/sh/new-machine.txt
--- a/Documentation/sh/register-banks.txt
+++ b/Documentation/sh/register-banks.txt
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
--- a/Documentation/usb/error-codes.txt
+++ b/Documentation/usb/error-codes.txt
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
--- a/Documentation/x86_64/kernel-stacks
+++ b/Documentation/x86_64/kernel-stacks
--- a/25
+++ b/25
--- a/6
+++ b/6
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
--- a/arch/arm/plat-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
--- a/arch/avr32/Kconfig.debug
+++ b/arch/avr32/Kconfig.debug
--- a/arch/avr32/Makefile
+++ b/arch/avr32/Makefile
--- a/arch/avr32/boards/atstk1000/Makefile
+++ b/arch/avr32/boards/atstk1000/Makefile
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
--- a/arch/avr32/boards/atstk1000/flash.c
+++ b/arch/avr32/boards/atstk1000/flash.c
--- a/arch/avr32/boards/atstk1000/setup.c
+++ b/arch/avr32/boards/atstk1000/setup.c
--- a/arch/avr32/boards/atstk1000/spi.c
+++ b/arch/avr32/boards/atstk1000/spi.c
--- a/arch/avr32/boot/images/Makefile
+++ b/arch/avr32/boot/images/Makefile
--- a/arch/avr32/boot/u-boot/Makefile
+++ b/arch/avr32/boot/u-boot/Makefile
--- a/arch/avr32/boot/u-boot/empty.S
+++ b/arch/avr32/boot/u-boot/empty.S
--- a/arch/avr32/boot/u-boot/head.S
+++ b/arch/avr32/boot/u-boot/head.S
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
--- a/arch/avr32/kernel/Makefile
+++ b/arch/avr32/kernel/Makefile
--- a/arch/avr32/kernel/asm-offsets.c
+++ b/arch/avr32/kernel/asm-offsets.c
--- a/arch/avr32/kernel/avr32_ksyms.c
+++ b/arch/avr32/kernel/avr32_ksyms.c
--- a/arch/avr32/kernel/cpu.c
+++ b/arch/avr32/kernel/cpu.c
--- a/arch/avr32/kernel/entry-avr32b.S
+++ b/arch/avr32/kernel/entry-avr32b.S
--- a/arch/avr32/kernel/head.S
+++ b/arch/avr32/kernel/head.S
--- a/arch/avr32/kernel/init_task.c
+++ b/arch/avr32/kernel/init_task.c
--- a/arch/avr32/kernel/irq.c
+++ b/arch/avr32/kernel/irq.c
--- a/arch/avr32/kernel/kprobes.c
+++ b/arch/avr32/kernel/kprobes.c
--- a/arch/avr32/kernel/module.c
+++ b/arch/avr32/kernel/module.c
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
--- a/arch/avr32/kernel/ptrace.c
+++ b/arch/avr32/kernel/ptrace.c
--- a/arch/avr32/kernel/semaphore.c
+++ b/arch/avr32/kernel/semaphore.c
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
--- a/arch/avr32/kernel/switch_to.S
+++ b/arch/avr32/kernel/switch_to.S
--- a/arch/avr32/kernel/sys_avr32.c
+++ b/arch/avr32/kernel/sys_avr32.c
--- a/arch/avr32/kernel/syscall-stubs.S
+++ b/arch/avr32/kernel/syscall-stubs.S
--- a/arch/avr32/kernel/syscall_table.S
+++ b/arch/avr32/kernel/syscall_table.S
--- a/arch/avr32/kernel/time.c
+++ b/arch/avr32/kernel/time.c
--- a/arch/avr32/kernel/traps.c
+++ b/arch/avr32/kernel/traps.c
--- a/arch/avr32/kernel/vmlinux.lds.c
+++ b/arch/avr32/kernel/vmlinux.lds.c
--- a/arch/avr32/lib/Makefile
+++ b/arch/avr32/lib/Makefile
--- a/arch/avr32/lib/__avr32_asr64.S
+++ b/arch/avr32/lib/__avr32_asr64.S
--- a/arch/avr32/lib/__avr32_lsl64.S
+++ b/arch/avr32/lib/__avr32_lsl64.S
--- a/arch/avr32/lib/__avr32_lsr64.S
+++ b/arch/avr32/lib/__avr32_lsr64.S
--- a/arch/avr32/lib/clear_user.S
+++ b/arch/avr32/lib/clear_user.S
--- a/arch/avr32/lib/copy_user.S
+++ b/arch/avr32/lib/copy_user.S
--- a/arch/avr32/lib/csum_partial.S
+++ b/arch/avr32/lib/csum_partial.S
--- a/arch/avr32/lib/csum_partial_copy_generic.S
+++ b/arch/avr32/lib/csum_partial_copy_generic.S
--- a/arch/avr32/lib/delay.c
+++ b/arch/avr32/lib/delay.c
--- a/arch/avr32/lib/findbit.S
+++ b/arch/avr32/lib/findbit.S
--- a/arch/avr32/lib/io-readsl.S
+++ b/arch/avr32/lib/io-readsl.S
--- a/arch/avr32/lib/io-readsw.S
+++ b/arch/avr32/lib/io-readsw.S
--- a/arch/avr32/lib/io-writesl.S
+++ b/arch/avr32/lib/io-writesl.S
--- a/arch/avr32/lib/io-writesw.S
+++ b/arch/avr32/lib/io-writesw.S
--- a/arch/avr32/lib/libgcc.h
+++ b/arch/avr32/lib/libgcc.h
--- a/arch/avr32/lib/longlong.h
+++ b/arch/avr32/lib/longlong.h
--- a/arch/avr32/lib/memcpy.S
+++ b/arch/avr32/lib/memcpy.S
--- a/arch/avr32/lib/memset.S
+++ b/arch/avr32/lib/memset.S
--- a/arch/avr32/lib/strncpy_from_user.S
+++ b/arch/avr32/lib/strncpy_from_user.S
--- a/arch/avr32/lib/strnlen_user.S
+++ b/arch/avr32/lib/strnlen_user.S
--- a/arch/avr32/mach-at32ap/Makefile
+++ b/arch/avr32/mach-at32ap/Makefile
--- a/arch/avr32/mach-at32ap/at32ap.c
+++ b/arch/avr32/mach-at32ap/at32ap.c
--- a/arch/avr32/mach-at32ap/at32ap7000.c
+++ b/arch/avr32/mach-at32ap/at32ap7000.c
--- a/arch/avr32/mach-at32ap/clock.c
+++ b/arch/avr32/mach-at32ap/clock.c
--- a/arch/avr32/mach-at32ap/clock.h
+++ b/arch/avr32/mach-at32ap/clock.h
--- a/arch/avr32/mach-at32ap/extint.c
+++ b/arch/avr32/mach-at32ap/extint.c
--- a/arch/avr32/mach-at32ap/hsmc.c
+++ b/arch/avr32/mach-at32ap/hsmc.c
--- a/arch/avr32/mach-at32ap/hsmc.h
+++ b/arch/avr32/mach-at32ap/hsmc.h
--- a/arch/avr32/mach-at32ap/intc.c
+++ b/arch/avr32/mach-at32ap/intc.c
--- a/arch/avr32/mach-at32ap/intc.h
+++ b/arch/avr32/mach-at32ap/intc.h
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
--- a/arch/avr32/mach-at32ap/pio.h
+++ b/arch/avr32/mach-at32ap/pio.h
--- a/arch/avr32/mach-at32ap/sm.c
+++ b/arch/avr32/mach-at32ap/sm.c
--- a/arch/avr32/mach-at32ap/sm.h
+++ b/arch/avr32/mach-at32ap/sm.h
--- a/Show more
+++ b/Show more