Merge branch 'linus' into core/rcu

2026-09-18 18:15:59 +00:00 · 2008-10-09 00:17:25 +02:00 · 2008-10-09 00:17:25 +02:00 · cdbb92b31d
commit cdbb92b31d
parent 2ec2b482b1 69849375d6
148 changed files with 1831 additions and 1085 deletions
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/SubmitChecklist
+++ b/Documentation/SubmitChecklist
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
--- a/3
+++ b/3
--- a/2
+++ b/2
--- a/arch/ia64/include/asm/sections.h
+++ b/arch/ia64/include/asm/sections.h
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
--- 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/mips/Kconfig
+++ b/arch/mips/Kconfig
--- 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/head.S
+++ b/arch/mips/kernel/head.S
--- 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/sibyte/swarm/Makefile
+++ b/arch/mips/sibyte/swarm/Makefile
--- a/arch/mips/sibyte/swarm/platform.c
+++ b/arch/mips/sibyte/swarm/platform.c
--- a/arch/mn10300/kernel/irq.c
+++ b/arch/mn10300/kernel/irq.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/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/x86/boot/compressed/relocs.c
+++ b/arch/x86/boot/compressed/relocs.c
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.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/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.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/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
--- a/drivers/ide/mips/Makefile
+++ b/drivers/ide/mips/Makefile
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.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/media/common/tuners/tuner-xc2028.h
+++ b/drivers/media/common/tuners/tuner-xc2028.h
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
--- a/drivers/media/dvb/frontends/s5h1420.h
+++ b/drivers/media/dvb/frontends/s5h1420.h
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
--- a/drivers/media/video/cpia2/cpia2_usb.c
+++ b/drivers/media/video/cpia2/cpia2_usb.c
--- a/drivers/media/video/cx18/cx18-cards.c
+++ b/drivers/media/video/cx18/cx18-cards.c
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
--- a/drivers/media/video/wm8739.c
+++ b/drivers/media/video/wm8739.c
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.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/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
--- a/drivers/spi/orion_spi.c
+++ b/drivers/spi/orion_spi.c
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
--- a/Show more
+++ b/Show more