Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2026-09-14 18:22:56 +00:00 · 2005-11-29 20:56:07 -08:00 · 2005-11-29 20:56:07 -08:00 · 606c0dafbe
commit 606c0dafbe
parent 6ab16d2495 d2ef5ebb4c
162 changed files with 1718 additions and 2046 deletions
--- a/2
+++ b/2
--- a/arch/arm/configs/corgi_defconfig
+++ b/arch/arm/configs/corgi_defconfig
--- a/arch/arm/configs/poodle_defconfig
+++ b/arch/arm/configs/poodle_defconfig
--- a/arch/arm/configs/spitz_defconfig
+++ b/arch/arm/configs/spitz_defconfig
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
--- a/arch/arm/mm/consistent.c
+++ b/arch/arm/mm/consistent.c
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
--- a/arch/frv/kernel/semaphore.c
+++ b/arch/frv/kernel/semaphore.c
--- a/arch/frv/mb93090-mb00/pci-irq.c
+++ b/arch/frv/mb93090-mb00/pci-irq.c
--- a/arch/frv/mm/init.c
+++ b/arch/frv/mm/init.c
--- a/arch/frv/mm/pgalloc.c
+++ b/arch/frv/mm/pgalloc.c
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
--- a/arch/i386/kernel/reboot.c
+++ b/arch/i386/kernel/reboot.c
--- 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/traps.c
+++ b/arch/ia64/kernel/traps.c
--- a/arch/m32r/kernel/io_mappi3.c
+++ b/arch/m32r/kernel/io_mappi3.c
--- a/arch/m32r/kernel/setup_mappi3.c
+++ b/arch/m32r/kernel/setup_mappi3.c
--- a/arch/m32r/kernel/sys_m32r.c
+++ b/arch/m32r/kernel/sys_m32r.c
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
--- a/arch/ppc/kernel/process.c
+++ b/arch/ppc/kernel/process.c
--- a/arch/sparc/mm/generic.c
+++ b/arch/sparc/mm/generic.c
--- a/arch/sparc64/mm/generic.c
+++ b/arch/sparc64/mm/generic.c
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
--- a/drivers/atm/Makefile
+++ b/drivers/atm/Makefile
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
--- a/drivers/atm/atmdev_init.c
+++ b/drivers/atm/atmdev_init.c
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
--- a/drivers/md/raid6main.c
+++ b/drivers/md/raid6main.c
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
--- a/drivers/media/video/cx88/Makefile
+++ b/drivers/media/video/cx88/Makefile
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
--- a/drivers/mtd/chips/cfi_probe.c
+++ b/drivers/mtd/chips/cfi_probe.c
--- a/drivers/mtd/chips/sharp.c
+++ b/drivers/mtd/chips/sharp.c
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
--- a/drivers/mtd/devices/ms02-nv.c
+++ b/drivers/mtd/devices/ms02-nv.c
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
--- a/drivers/mtd/maps/pci.c
+++ b/drivers/mtd/maps/pci.c
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
--- a/drivers/mtd/maps/sc520cdp.c
+++ b/drivers/mtd/maps/sc520cdp.c
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
--- a/drivers/pcmcia/m32r_cfc.c
+++ b/drivers/pcmcia/m32r_cfc.c
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
--- a/drivers/video/console/fbcon_ccw.c
+++ b/drivers/video/console/fbcon_ccw.c
--- a/drivers/video/console/fbcon_rotate.h
+++ b/drivers/video/console/fbcon_rotate.h
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
--- a/fs/dquot.c
+++ b/fs/dquot.c
--- a/fs/exec.c
+++ b/fs/exec.c
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
--- a/fs/hfsplus/hfsplus_raw.h
+++ b/fs/hfsplus/hfsplus_raw.h
--- a/fs/hfsplus/options.c
+++ b/fs/hfsplus/options.c
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
--- a/include/asm-arm/arch-s3c2410/regs-gpio.h
+++ b/include/asm-arm/arch-s3c2410/regs-gpio.h
--- a/include/asm-arm/arch-sa1100/io.h
+++ b/include/asm-arm/arch-sa1100/io.h
--- a/include/asm-frv/hardirq.h
+++ b/include/asm-frv/hardirq.h
--- a/include/asm-frv/ide.h
+++ b/include/asm-frv/ide.h
--- a/include/asm-frv/page.h
+++ b/include/asm-frv/page.h
--- a/include/asm-frv/semaphore.h
+++ b/include/asm-frv/semaphore.h
--- a/include/asm-frv/thread_info.h
+++ b/include/asm-frv/thread_info.h
--- a/include/asm-ia64/page.h
+++ b/include/asm-ia64/page.h
--- a/include/asm-m32r/atomic.h
+++ b/include/asm-m32r/atomic.h
--- a/include/asm-m32r/ide.h
+++ b/include/asm-m32r/ide.h
--- a/Show more
+++ b/Show more