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

2026-09-22 18:22:42 +00:00 · 2008-04-17 23:38:45 +00:00 · 2008-04-17 23:38:45 +00:00 · 20e673810c
commit 20e673810c
parent 8d142137b4 4b119e21d0
93 changed files with 510 additions and 196 deletions
--- a/Documentation/filesystems/seq_file.txt
+++ b/Documentation/filesystems/seq_file.txt
--- a/Documentation/networking/can.txt
+++ b/Documentation/networking/can.txt
--- a/Documentation/vm/hugetlbpage.txt
+++ b/Documentation/vm/hugetlbpage.txt
--- a/14
+++ b/14
--- a/2
+++ b/2
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
--- a/block/Kconfig
+++ b/block/Kconfig
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
--- a/drivers/leds/leds-ams-delta.c
+++ b/drivers/leds/leds-ams-delta.c
--- a/drivers/leds/leds-atmel-pwm.c
+++ b/drivers/leds/leds-atmel-pwm.c
--- a/drivers/leds/leds-clevo-mail.c
+++ b/drivers/leds/leds-clevo-mail.c
--- a/drivers/leds/leds-cm-x270.c
+++ b/drivers/leds/leds-cm-x270.c
--- a/drivers/leds/leds-cobalt-qube.c
+++ b/drivers/leds/leds-cobalt-qube.c
--- a/drivers/leds/leds-corgi.c
+++ b/drivers/leds/leds-corgi.c
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
--- a/drivers/leds/leds-h1940.c
+++ b/drivers/leds/leds-h1940.c
--- a/drivers/leds/leds-hp6xx.c
+++ b/drivers/leds/leds-hp6xx.c
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
--- a/drivers/leds/leds-spitz.c
+++ b/drivers/leds/leds-spitz.c
--- a/drivers/leds/leds-tosa.c
+++ b/drivers/leds/leds-tosa.c
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
--- a/drivers/misc/atmel_pwm.c
+++ b/drivers/misc/atmel_pwm.c
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
--- a/drivers/mmc/host/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
--- a/drivers/serial/mcf.c
+++ b/drivers/serial/mcf.c
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
--- a/drivers/serial/netx-serial.c
+++ b/drivers/serial/netx-serial.c
--- a/drivers/serial/pnx8xxx_uart.c
+++ b/drivers/serial/pnx8xxx_uart.c
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
--- a/drivers/serial/sc26xx.c
+++ b/drivers/serial/sc26xx.c
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
--- a/drivers/thermal/thermal.c
+++ b/drivers/thermal/thermal.c
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
--- a/fs/afs/main.c
+++ b/fs/afs/main.c
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
--- a/fs/ext3/xattr.c
+++ b/fs/ext3/xattr.c
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
--- a/fs/mbcache.c
+++ b/fs/mbcache.c
--- a/include/asm-arm/arch-s3c2410/spi.h
+++ b/include/asm-arm/arch-s3c2410/spi.h
--- a/include/asm-mips/mach-au1x00/au1xxx_ide.h
+++ b/include/asm-mips/mach-au1x00/au1xxx_ide.h
--- a/include/asm-mips/mach-db1x00/db1200.h
+++ b/include/asm-mips/mach-db1x00/db1200.h
--- a/include/asm-mips/mach-pb1x00/pb1200.h
+++ b/include/asm-mips/mach-pb1x00/pb1200.h
--- a/include/asm-um/tlb.h
+++ b/include/asm-um/tlb.h
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
--- a/include/linux/mbcache.h
+++ b/include/linux/mbcache.h
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
--- a/kernel/printk.c
+++ b/kernel/printk.c
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
--- a/mm/sparse.c
+++ b/mm/sparse.c
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c