Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

2026-09-24 18:16:04 +00:00 · 2008-02-06 16:04:00 +00:00 · 2008-02-06 16:04:00 +00:00 · f315ccb3e6
commit f315ccb3e6
parent ead03e30b0 551e4fb246
684 changed files with 34037 additions and 8650 deletions
--- a/Documentation/DocBook/s390-drivers.tmpl
+++ b/Documentation/DocBook/s390-drivers.tmpl
--- a/Documentation/Smack.txt
+++ b/Documentation/Smack.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
--- a/Documentation/i2c/chips/pca9539
+++ b/Documentation/i2c/chips/pca9539
--- a/Documentation/ia64/aliasing-test.c
+++ b/Documentation/ia64/aliasing-test.c
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/pcmcia/driver-changes.txt
+++ b/Documentation/pcmcia/driver-changes.txt
--- a/Documentation/pm_qos_interface.txt
+++ b/Documentation/pm_qos_interface.txt
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
--- a/19
+++ b/19
--- a/arch/alpha/kernel/pci-noop.c
+++ b/arch/alpha/kernel/pci-noop.c
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
--- a/arch/alpha/kernel/systbls.S
+++ b/arch/alpha/kernel/systbls.S
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
--- a/arch/arm/mach-pxa/generic.h
+++ b/arch/arm/mach-pxa/generic.h
--- a/arch/arm/mach-pxa/gpio.c
+++ b/arch/arm/mach-pxa/gpio.c
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
--- a/arch/arm/mm/pgd.c
+++ b/arch/arm/mm/pgd.c
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
--- a/arch/avr32/kernel/syscall_table.S
+++ b/arch/avr32/kernel/syscall_table.S
--- 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/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
--- a/arch/cris/arch-v10/Kconfig
+++ b/arch/cris/arch-v10/Kconfig
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
--- a/arch/cris/arch-v10/kernel/entry.S
+++ b/arch/cris/arch-v10/kernel/entry.S
--- a/arch/cris/arch-v32/Kconfig
+++ b/arch/cris/arch-v32/Kconfig
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
--- a/arch/cris/arch-v32/drivers/pci/dma.c
+++ b/arch/cris/arch-v32/drivers/pci/dma.c
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
--- a/arch/frv/kernel/vmlinux.lds.S
+++ b/arch/frv/kernel/vmlinux.lds.S
--- a/arch/frv/mm/mmu-context.c
+++ b/arch/frv/mm/mmu-context.c
--- a/arch/frv/mm/pgalloc.c
+++ b/arch/frv/mm/pgalloc.c
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
--- a/arch/ia64/ia32/ia32_support.c
+++ b/arch/ia64/ia32/ia32_support.c
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/ia64/kernel/fsyscall_gtod_data.h
+++ b/arch/ia64/kernel/fsyscall_gtod_data.h
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
--- a/arch/ia64/kernel/mca_asm.S
+++ b/arch/ia64/kernel/mca_asm.S
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
--- a/arch/ia64/kernel/mca_drv.h
+++ b/arch/ia64/kernel/mca_drv.h
--- a/arch/ia64/kernel/mca_drv_asm.S
+++ b/arch/ia64/kernel/mca_drv_asm.S
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
--- a/arch/ia64/kernel/sal.c
+++ b/arch/ia64/kernel/sal.c
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
--- a/arch/ia64/kernel/unaligned.c
+++ b/arch/ia64/kernel/unaligned.c
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
--- a/arch/m32r/boot/compressed/m32r_sio.c
+++ b/arch/m32r/boot/compressed/m32r_sio.c
--- a/arch/m32r/kernel/syscall_table.S
+++ b/arch/m32r/kernel/syscall_table.S
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
--- a/arch/m68k/amiga/Makefile
+++ b/arch/m68k/amiga/Makefile
--- a/arch/m68k/amiga/amiga_ksyms.c
+++ b/arch/m68k/amiga/amiga_ksyms.c
--- a/arch/m68k/amiga/amisound.c
+++ b/arch/m68k/amiga/amisound.c
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
--- a/arch/m68k/amiga/pcmcia.c
+++ b/arch/m68k/amiga/pcmcia.c
--- a/arch/m68k/atari/Makefile
+++ b/arch/m68k/atari/Makefile
--- a/arch/m68k/atari/ataints.c
+++ b/arch/m68k/atari/ataints.c
--- a/arch/m68k/atari/atari_ksyms.c
+++ b/arch/m68k/atari/atari_ksyms.c
--- a/arch/m68k/atari/atasound.c
+++ b/arch/m68k/atari/atasound.c
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
--- a/arch/m68k/atari/debug.c
+++ b/arch/m68k/atari/debug.c
--- a/arch/m68k/atari/hades-pci.c
+++ b/arch/m68k/atari/hades-pci.c
--- a/arch/m68k/atari/stdma.c
+++ b/arch/m68k/atari/stdma.c
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
--- a/arch/m68k/hp300/Makefile
+++ b/arch/m68k/hp300/Makefile
--- a/arch/m68k/hp300/ksyms.c
+++ b/arch/m68k/hp300/ksyms.c
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
--- a/arch/m68k/mac/Makefile
+++ b/arch/m68k/mac/Makefile
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
--- a/arch/m68k/mac/mac_ksyms.c
+++ b/arch/m68k/mac/mac_ksyms.c
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
--- a/arch/m68k/mvme16x/Makefile
+++ b/arch/m68k/mvme16x/Makefile
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
--- a/arch/m68k/mvme16x/mvme16x_ksyms.c
+++ b/arch/m68k/mvme16x/mvme16x_ksyms.c
--- a/arch/m68knommu/Kconfig.debug
+++ b/arch/m68knommu/Kconfig.debug
--- a/arch/m68knommu/defconfig
+++ b/arch/m68knommu/defconfig
--- a/arch/m68knommu/kernel/m68k_ksyms.c
+++ b/arch/m68knommu/kernel/m68k_ksyms.c
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
--- a/arch/m68knommu/kernel/syscalltable.S
+++ b/arch/m68knommu/kernel/syscalltable.S
--- 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/Show more
+++ b/Show more