Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge

2026-09-26 18:16:26 +00:00 · 2009-04-03 02:29:05 -07:00 · 2009-04-03 02:29:05 -07:00 · 65127d28e3
commit 65127d28e3
parent b8bb76713e 8fe74cf053
366 changed files with 34561 additions and 6286 deletions
--- a/Documentation/DocBook/.gitignore
+++ b/Documentation/DocBook/.gitignore
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
--- a/Documentation/cgroups/memcg_test.txt
+++ b/Documentation/cgroups/memcg_test.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/gpio.txt
+++ b/Documentation/gpio.txt
--- a/Documentation/networking/vxge.txt
+++ b/Documentation/networking/vxge.txt
--- a/Documentation/sysctl/00-INDEX
+++ b/Documentation/sysctl/00-INDEX
--- a/Documentation/sysctl/fs.txt
+++ b/Documentation/sysctl/fs.txt
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
--- a/Documentation/sysctl/net.txt
+++ b/Documentation/sysctl/net.txt
--- a/13
+++ b/13
--- a/arch/alpha/include/asm/spinlock.h
+++ b/arch/alpha/include/asm/spinlock.h
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
--- a/arch/arm/include/asm/spinlock.h
+++ b/arch/arm/include/asm/spinlock.h
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
--- a/arch/cris/arch-v10/kernel/process.c
+++ b/arch/cris/arch-v10/kernel/process.c
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
--- a/arch/cris/include/arch-v32/arch/spinlock.h
+++ b/arch/cris/include/arch-v32/arch/spinlock.h
--- a/arch/cris/kernel/process.c
+++ b/arch/cris/kernel/process.c
--- a/arch/frv/kernel/process.c
+++ b/arch/frv/kernel/process.c
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
--- a/arch/ia64/configs/generic_defconfig
+++ b/arch/ia64/configs/generic_defconfig
--- a/arch/ia64/include/asm/spinlock.h
+++ b/arch/ia64/include/asm/spinlock.h
--- a/arch/ia64/include/asm/uv/uv_hub.h
+++ b/arch/ia64/include/asm/uv/uv_hub.h
--- a/arch/ia64/include/asm/uv/uv_mmrs.h
+++ b/arch/ia64/include/asm/uv/uv_mmrs.h
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
--- a/arch/m32r/kernel/process.c
+++ b/arch/m32r/kernel/process.c
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
--- a/arch/mips/include/asm/spinlock.h
+++ b/arch/mips/include/asm/spinlock.h
--- a/arch/mips/include/asm/unistd.h
+++ b/arch/mips/include/asm/unistd.h
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
--- a/arch/mn10300/kernel/process.c
+++ b/arch/mn10300/kernel/process.c
--- a/arch/parisc/include/asm/spinlock.h
+++ b/arch/parisc/include/asm/spinlock.h
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
--- a/arch/powerpc/include/asm/spinlock.h
+++ b/arch/powerpc/include/asm/spinlock.h
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
--- a/arch/s390/Kconfig.debug
+++ b/arch/s390/Kconfig.debug
--- a/arch/s390/include/asm/spinlock.h
+++ b/arch/s390/include/asm/spinlock.h
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
--- a/arch/sh/include/asm/spinlock.h
+++ b/arch/sh/include/asm/spinlock.h
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
--- a/arch/sparc/Kconfig.debug
+++ b/arch/sparc/Kconfig.debug
--- a/arch/sparc/include/asm/spinlock_32.h
+++ b/arch/sparc/include/asm/spinlock_32.h
--- a/arch/sparc/include/asm/spinlock_64.h
+++ b/arch/sparc/include/asm/spinlock_64.h
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
--- a/arch/um/sys-i386/sys_call_table.S
+++ b/arch/um/sys-i386/sys_call_table.S
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
--- a/arch/x86/include/asm/spinlock.h
+++ b/arch/x86/include/asm/spinlock.h
--- a/arch/x86/include/asm/unistd_32.h
+++ b/arch/x86/include/asm/unistd_32.h
--- a/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
--- a/arch/x86/include/asm/uv/uv_mmrs.h
+++ b/arch/x86/include/asm/uv/uv_mmrs.h
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
--- a/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
--- a/drivers/char/tty_audit.c
+++ b/drivers/char/tty_audit.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
--- a/drivers/char/tty_ldisc.c
+++ b/drivers/char/tty_ldisc.c
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
--- a/drivers/edac/amd8111_edac.c
+++ b/drivers/edac/amd8111_edac.c
--- a/drivers/edac/amd8111_edac.h
+++ b/drivers/edac/amd8111_edac.h
--- a/drivers/edac/amd8131_edac.c
+++ b/drivers/edac/amd8131_edac.c
--- a/drivers/edac/amd8131_edac.h
+++ b/drivers/edac/amd8131_edac.h
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
--- a/drivers/edac/edac_pci.c
+++ b/drivers/edac/edac_pci.c
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
--- a/drivers/edac/ppc4xx_edac.h
+++ b/drivers/edac/ppc4xx_edac.h
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
--- a/Show more
+++ b/Show more