Merge branch 'linus' into x86/defconfig

2026-11-13 07:31:07 +00:00 · 2008-08-11 22:01:54 +02:00 · 2008-08-11 22:01:54 +02:00 · f255689659
commit f255689659
parent 7c13e6a3d1 10fec20ef5
105 changed files with 6851 additions and 2362 deletions
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/6
+++ b/6
--- a/arch/avr32/Makefile
+++ b/arch/avr32/Makefile
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
--- a/arch/avr32/configs/atngw100_defconfig
+++ b/arch/avr32/configs/atngw100_defconfig
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
--- a/arch/avr32/configs/atstk1003_defconfig
+++ b/arch/avr32/configs/atstk1003_defconfig
--- a/arch/avr32/configs/atstk1004_defconfig
+++ b/arch/avr32/configs/atstk1004_defconfig
--- a/arch/avr32/configs/atstk1006_defconfig
+++ b/arch/avr32/configs/atstk1006_defconfig
--- a/arch/avr32/mach-at32ap/Makefile
+++ b/arch/avr32/mach-at32ap/Makefile
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
--- a/arch/avr32/mach-at32ap/clock.c
+++ b/arch/avr32/mach-at32ap/clock.c
--- a/arch/avr32/mach-at32ap/hmatrix.c
+++ b/arch/avr32/mach-at32ap/hmatrix.c
--- a/arch/avr32/mach-at32ap/hmatrix.h
+++ b/arch/avr32/mach-at32ap/hmatrix.h
--- a/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
+++ b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
--- a/arch/avr32/mach-at32ap/include/mach/chip.h
+++ b/arch/avr32/mach-at32ap/include/mach/chip.h
--- a/arch/avr32/mach-at32ap/include/mach/hmatrix.h
+++ b/arch/avr32/mach-at32ap/include/mach/hmatrix.h
--- a/arch/avr32/mach-at32ap/pm.c
+++ b/arch/avr32/mach-at32ap/pm.c
--- a/arch/avr32/mach-at32ap/pm.h
+++ b/arch/avr32/mach-at32ap/pm.h
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
--- a/arch/m68knommu/include/asm/unistd.h
+++ b/arch/m68knommu/include/asm/unistd.h
--- a/arch/m68knommu/kernel/syscalltable.S
+++ b/arch/m68knommu/kernel/syscalltable.S
--- a/arch/powerpc/boot/dts/warp.dts
+++ b/arch/powerpc/boot/dts/warp.dts
--- a/arch/powerpc/configs/40x/ep405_defconfig
+++ b/arch/powerpc/configs/40x/ep405_defconfig
--- a/arch/powerpc/configs/40x/kilauea_defconfig
+++ b/arch/powerpc/configs/40x/kilauea_defconfig
--- a/arch/powerpc/configs/40x/makalu_defconfig
+++ b/arch/powerpc/configs/40x/makalu_defconfig
--- a/arch/powerpc/configs/40x/walnut_defconfig
+++ b/arch/powerpc/configs/40x/walnut_defconfig
--- a/arch/powerpc/configs/44x/bamboo_defconfig
+++ b/arch/powerpc/configs/44x/bamboo_defconfig
--- a/arch/powerpc/configs/44x/canyonlands_defconfig
+++ b/arch/powerpc/configs/44x/canyonlands_defconfig
--- a/arch/powerpc/configs/44x/ebony_defconfig
+++ b/arch/powerpc/configs/44x/ebony_defconfig
--- a/arch/powerpc/configs/44x/katmai_defconfig
+++ b/arch/powerpc/configs/44x/katmai_defconfig
--- a/arch/powerpc/configs/44x/rainier_defconfig
+++ b/arch/powerpc/configs/44x/rainier_defconfig
--- a/arch/powerpc/configs/44x/sam440ep_defconfig
+++ b/arch/powerpc/configs/44x/sam440ep_defconfig
--- a/arch/powerpc/configs/44x/sequoia_defconfig
+++ b/arch/powerpc/configs/44x/sequoia_defconfig
--- a/arch/powerpc/configs/44x/taishan_defconfig
+++ b/arch/powerpc/configs/44x/taishan_defconfig
--- a/arch/powerpc/configs/44x/virtex5_defconfig
+++ b/arch/powerpc/configs/44x/virtex5_defconfig
--- a/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_defconfig
--- a/arch/powerpc/configs/ppc40x_defconfig
+++ b/arch/powerpc/configs/ppc40x_defconfig
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
--- a/arch/powerpc/include/asm/mmu-hash64.h
+++ b/arch/powerpc/include/asm/mmu-hash64.h
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
--- a/arch/powerpc/platforms/44x/warp-nand.c
+++ b/arch/powerpc/platforms/44x/warp-nand.c
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
--- a/drivers/i2c/algos/Kconfig
+++ b/drivers/i2c/algos/Kconfig
--- a/drivers/i2c/busses/i2c-amd756-s4882.c
+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
--- a/drivers/i2c/chips/at24.c
+++ b/drivers/i2c/chips/at24.c
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
--- a/drivers/watchdog/ixp4xx_wdt.c
+++ b/drivers/watchdog/ixp4xx_wdt.c
--- a/drivers/watchdog/pcwd.c
+++ b/drivers/watchdog/pcwd.c
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
--- a/drivers/watchdog/txx9wdt.c
+++ b/drivers/watchdog/txx9wdt.c
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
--- a/include/asm-avr32/arch-at32ap/at32ap700x.h
+++ b/include/asm-avr32/arch-at32ap/at32ap700x.h
--- a/include/asm-avr32/arch-at32ap/board.h
+++ b/include/asm-avr32/arch-at32ap/board.h
--- a/include/asm-avr32/arch-at32ap/cpu.h
+++ b/include/asm-avr32/arch-at32ap/cpu.h
--- a/include/asm-avr32/arch-at32ap/gpio.h
+++ b/include/asm-avr32/arch-at32ap/gpio.h
--- a/include/asm-avr32/arch-at32ap/init.h
+++ b/include/asm-avr32/arch-at32ap/init.h
--- a/include/asm-avr32/arch-at32ap/io.h
+++ b/include/asm-avr32/arch-at32ap/io.h
--- a/include/asm-avr32/arch-at32ap/irq.h
+++ b/include/asm-avr32/arch-at32ap/irq.h
--- a/include/asm-avr32/arch-at32ap/pm.h
+++ b/include/asm-avr32/arch-at32ap/pm.h
--- a/include/asm-avr32/arch-at32ap/portmux.h
+++ b/include/asm-avr32/arch-at32ap/portmux.h
--- a/include/asm-avr32/arch-at32ap/smc.h
+++ b/include/asm-avr32/arch-at32ap/smc.h
--- a/include/asm-avr32/arch-at32ap/sram.h
+++ b/include/asm-avr32/arch-at32ap/sram.h
--- a/include/asm-m68k/unistd.h
+++ b/include/asm-m68k/unistd.h
--- a/include/linux/harrier_defs.h
+++ b/include/linux/harrier_defs.h
--- a/include/linux/mfd/t7l66xb.h
+++ b/include/linux/mfd/t7l66xb.h
--- a/include/linux/mfd/tc6387xb.h
+++ b/include/linux/mfd/tc6387xb.h
--- a/include/linux/mfd/tc6393xb.h
+++ b/include/linux/mfd/tc6393xb.h
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/Show more
+++ b/Show more