Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

2026-09-24 18:16:04 +00:00 · 2008-05-23 13:48:37 +10:00 · 2008-05-23 13:48:37 +10:00 · c1e554aeea
commit c1e554aeea
parent c203e45f06 78b58e549a
559 changed files with 6283 additions and 4695 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/3
+++ b/3
--- a/129
+++ b/129
--- a/3
+++ b/3
--- a/arch/alpha/kernel/init_task.c
+++ b/arch/alpha/kernel/init_task.c
--- a/arch/arm/kernel/init_task.c
+++ b/arch/arm/kernel/init_task.c
--- a/arch/avr32/kernel/init_task.c
+++ b/arch/avr32/kernel/init_task.c
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
--- a/arch/blackfin/configs/BF527-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF527-EZKIT_defconfig
--- a/arch/blackfin/configs/BF548-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF548-EZKIT_defconfig
--- a/arch/blackfin/configs/IP0X_defconfig
+++ b/arch/blackfin/configs/IP0X_defconfig
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
--- a/arch/blackfin/kernel/bfin_ksyms.c
+++ b/arch/blackfin/kernel/bfin_ksyms.c
--- a/arch/blackfin/kernel/init_task.c
+++ b/arch/blackfin/kernel/init_task.c
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
--- a/arch/blackfin/lib/checksum.c
+++ b/arch/blackfin/lib/checksum.c
--- a/arch/blackfin/lib/ins.S
+++ b/arch/blackfin/lib/ins.S
--- a/arch/blackfin/lib/outs.S
+++ b/arch/blackfin/lib/outs.S
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
--- a/arch/cris/kernel/process.c
+++ b/arch/cris/kernel/process.c
--- a/arch/frv/kernel/init_task.c
+++ b/arch/frv/kernel/init_task.c
--- a/arch/h8300/kernel/init_task.c
+++ b/arch/h8300/kernel/init_task.c
--- a/arch/ia64/kernel/init_task.c
+++ b/arch/ia64/kernel/init_task.c
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
--- a/arch/ia64/kvm/memcpy.S
+++ b/arch/ia64/kvm/memcpy.S
--- a/arch/ia64/kvm/memset.S
+++ b/arch/ia64/kvm/memset.S
--- a/arch/m32r/kernel/init_task.c
+++ b/arch/m32r/kernel/init_task.c
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
--- a/arch/m68k/lib/string.c
+++ b/arch/m68k/lib/string.c
--- a/arch/m68knommu/kernel/init_task.c
+++ b/arch/m68knommu/kernel/init_task.c
--- a/arch/mips/kernel/init_task.c
+++ b/arch/mips/kernel/init_task.c
--- a/arch/mn10300/kernel/init_task.c
+++ b/arch/mn10300/kernel/init_task.c
--- a/arch/parisc/kernel/init_task.c
+++ b/arch/parisc/kernel/init_task.c
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
--- a/arch/powerpc/boot/4xx.c
+++ b/arch/powerpc/boot/4xx.c
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
--- a/arch/powerpc/kernel/init_task.c
+++ b/arch/powerpc/kernel/init_task.c
--- a/arch/powerpc/mm/hash_low_32.S
+++ b/arch/powerpc/mm/hash_low_32.S
--- a/arch/s390/kernel/init_task.c
+++ b/arch/s390/kernel/init_task.c
--- a/arch/sh/drivers/heartbeat.c
+++ b/arch/sh/drivers/heartbeat.c
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
--- a/arch/sh/kernel/head_32.S
+++ b/arch/sh/kernel/head_32.S
--- a/arch/sh/kernel/init_task.c
+++ b/arch/sh/kernel/init_task.c
--- a/arch/sh/kernel/kgdb_stub.c
+++ b/arch/sh/kernel/kgdb_stub.c
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
--- a/arch/sh/lib/memcpy-sh4.S
+++ b/arch/sh/lib/memcpy-sh4.S
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
--- a/arch/sparc/boot/Makefile
+++ b/arch/sparc/boot/Makefile
--- a/arch/sparc/boot/btfixupprep.c
+++ b/arch/sparc/boot/btfixupprep.c
--- a/arch/sparc/boot/piggyback.c
+++ b/arch/sparc/boot/piggyback.c
--- a/arch/sparc/kernel/ebus.c
+++ b/arch/sparc/kernel/ebus.c
--- a/arch/sparc/kernel/etrap.S
+++ b/arch/sparc/kernel/etrap.S
--- a/arch/sparc/kernel/head.S
+++ b/arch/sparc/kernel/head.S
--- a/arch/sparc/kernel/idprom.c
+++ b/arch/sparc/kernel/idprom.c
--- a/arch/sparc/kernel/init_task.c
+++ b/arch/sparc/kernel/init_task.c
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
--- a/arch/sparc/kernel/muldiv.c
+++ b/arch/sparc/kernel/muldiv.c
--- a/arch/sparc/kernel/rtrap.S
+++ b/arch/sparc/kernel/rtrap.S
--- a/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
--- a/arch/sparc/kernel/trampoline.S
+++ b/arch/sparc/kernel/trampoline.S
--- a/arch/sparc/kernel/traps.c
+++ b/arch/sparc/kernel/traps.c
--- a/arch/sparc/kernel/unaligned.c
+++ b/arch/sparc/kernel/unaligned.c
--- a/arch/sparc/kernel/wof.S
+++ b/arch/sparc/kernel/wof.S
--- a/arch/sparc/kernel/wuf.S
+++ b/arch/sparc/kernel/wuf.S
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
--- a/arch/sparc/lib/ashldi3.S
+++ b/arch/sparc/lib/ashldi3.S
--- a/arch/sparc/lib/ashrdi3.S
+++ b/arch/sparc/lib/ashrdi3.S
--- a/arch/sparc/lib/blockops.S
+++ b/arch/sparc/lib/blockops.S
--- a/arch/sparc/lib/locks.S
+++ b/arch/sparc/lib/locks.S
--- a/arch/sparc/lib/lshrdi3.S
+++ b/arch/sparc/lib/lshrdi3.S
--- a/arch/sparc/lib/memscan.S
+++ b/arch/sparc/lib/memscan.S
--- a/arch/sparc/lib/mul.S
+++ b/arch/sparc/lib/mul.S
--- a/arch/sparc/lib/rem.S
+++ b/arch/sparc/lib/rem.S
--- a/arch/sparc/lib/rwsem.S
+++ b/arch/sparc/lib/rwsem.S
--- a/arch/sparc/lib/sdiv.S
+++ b/arch/sparc/lib/sdiv.S
--- a/arch/sparc/lib/strncmp.S
+++ b/arch/sparc/lib/strncmp.S
--- a/arch/sparc/lib/udiv.S
+++ b/arch/sparc/lib/udiv.S
--- a/arch/sparc/lib/umul.S
+++ b/arch/sparc/lib/umul.S
--- a/arch/sparc/lib/urem.S
+++ b/arch/sparc/lib/urem.S
--- a/arch/sparc/math-emu/ashldi3.S
+++ b/arch/sparc/math-emu/ashldi3.S
--- a/arch/sparc/mm/Makefile
+++ b/arch/sparc/mm/Makefile
--- a/arch/sparc/mm/fault.c
+++ b/arch/sparc/mm/fault.c
--- a/arch/sparc/mm/generic.c
+++ b/arch/sparc/mm/generic.c
--- a/arch/sparc/mm/hypersparc.S
+++ b/arch/sparc/mm/hypersparc.S
--- a/arch/sparc/mm/init.c
+++ b/arch/sparc/mm/init.c
--- a/arch/sparc/mm/io-unit.c
+++ b/arch/sparc/mm/io-unit.c
--- a/arch/sparc/mm/loadmmu.c
+++ b/arch/sparc/mm/loadmmu.c
--- a/Show more
+++ b/Show more