Merge branch 'linus' into sched/devel

2026-09-18 18:15:59 +00:00 · 2008-10-06 08:13:18 +02:00 · 2008-10-06 08:13:18 +02:00 · 2c10c22af0
commit 2c10c22af0
parent f6121f4f87 fec6ed1d1f
219 changed files with 2486 additions and 1485 deletions
--- a/Documentation/DMA-mapping.txt
+++ b/Documentation/DMA-mapping.txt
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/SubmitChecklist
+++ b/Documentation/SubmitChecklist
--- a/Documentation/ioctl/cdrom.txt
+++ b/Documentation/ioctl/cdrom.txt
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
--- a/Documentation/usb/anchors.txt
+++ b/Documentation/usb/anchors.txt
--- a/10
+++ b/10
--- a/2
+++ b/2
--- a/arch/arm/kernel/kgdb.c
+++ b/arch/arm/kernel/kgdb.c
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
--- a/arch/ia64/include/asm/sections.h
+++ b/arch/ia64/include/asm/sections.h
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
--- a/arch/m32r/kernel/head.S
+++ b/arch/m32r/kernel/head.S
--- a/arch/m32r/kernel/irq.c
+++ b/arch/m32r/kernel/irq.c
--- a/arch/m32r/kernel/m32r_ksyms.c
+++ b/arch/m32r/kernel/m32r_ksyms.c
--- a/arch/m32r/kernel/process.c
+++ b/arch/m32r/kernel/process.c
--- a/arch/m32r/kernel/smp.c
+++ b/arch/m32r/kernel/smp.c
--- a/arch/m32r/kernel/time.c
+++ b/arch/m32r/kernel/time.c
--- a/arch/m32r/kernel/traps.c
+++ b/arch/m32r/kernel/traps.c
--- a/arch/m32r/lib/delay.c
+++ b/arch/m32r/lib/delay.c
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/au1000/common/gpio.c
+++ b/arch/mips/au1000/common/gpio.c
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
--- a/arch/mips/kernel/cevt-r4k.c
+++ b/arch/mips/kernel/cevt-r4k.c
--- a/arch/mips/kernel/cevt-smtc.c
+++ b/arch/mips/kernel/cevt-smtc.c
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
--- a/arch/mips/kernel/kgdb.c
+++ b/arch/mips/kernel/kgdb.c
--- a/arch/mips/kernel/mips-mt-fpaff.c
+++ b/arch/mips/kernel/mips-mt-fpaff.c
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
--- a/arch/mips/mti-malta/Makefile
+++ b/arch/mips/mti-malta/Makefile
--- a/arch/mips/mti-malta/malta-smtc.c
+++ b/arch/mips/mti-malta/malta-smtc.c
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
--- a/arch/mips/pci/pci-bcm47xx.c
+++ b/arch/mips/pci/pci-bcm47xx.c
--- a/arch/mips/pci/pci-ip27.c
+++ b/arch/mips/pci/pci-ip27.c
--- a/arch/mn10300/kernel/irq.c
+++ b/arch/mn10300/kernel/irq.c
--- a/arch/mn10300/kernel/time.c
+++ b/arch/mn10300/kernel/time.c
--- a/arch/mn10300/unit-asb2303/unit-init.c
+++ b/arch/mn10300/unit-asb2303/unit-init.c
--- a/arch/mn10300/unit-asb2305/unit-init.c
+++ b/arch/mn10300/unit-asb2305/unit-init.c
--- a/arch/powerpc/boot/dts/holly.dts
+++ b/arch/powerpc/boot/dts/holly.dts
--- a/arch/powerpc/kernel/idle.c
+++ b/arch/powerpc/kernel/idle.c
--- a/arch/powerpc/kernel/kgdb.c
+++ b/arch/powerpc/kernel/kgdb.c
--- a/arch/powerpc/platforms/fsl_uli1575.c
+++ b/arch/powerpc/platforms/fsl_uli1575.c
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
--- a/arch/x86/boot/compressed/relocs.c
+++ b/arch/x86/boot/compressed/relocs.c
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.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/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
--- a/drivers/accessibility/braille/braille_console.c
+++ b/drivers/accessibility/braille/braille_console.c
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.c
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
--- a/drivers/leds/leds-fsg.c
+++ b/drivers/leds/leds-fsg.c
--- a/drivers/leds/leds-pca955x.c
+++ b/drivers/leds/leds-pca955x.c
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
--- a/drivers/net/wireless/ath9k/core.c
+++ b/drivers/net/wireless/ath9k/core.c
--- a/drivers/net/wireless/ath9k/core.h
+++ b/drivers/net/wireless/ath9k/core.h
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
--- a/Show more
+++ b/Show more