Merge branch 'master' into upstream-fixes

2026-09-16 18:15:52 +00:00 · 2006-08-19 17:27:12 -04:00 · 2006-08-19 17:27:12 -04:00 · d14b50cc60
commit d14b50cc60
parent a34b6fc04d ef7d1b244f
153 changed files with 2440 additions and 1198 deletions
--- a/Documentation/fb/imacfb.txt
+++ b/Documentation/fb/imacfb.txt
--- a/Documentation/kobject.txt
+++ b/Documentation/kobject.txt
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
--- a/8
+++ b/8
--- a/32
+++ b/32
--- a/arch/arm/common/rtctime.c
+++ b/arch/arm/common/rtctime.c
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
--- a/arch/powerpc/kernel/cpu_setup_power4.S
+++ b/arch/powerpc/kernel/cpu_setup_power4.S
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
--- a/drivers/media/dvb/dvb-core/Makefile
+++ b/drivers/media/dvb/dvb-core/Makefile
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
--- a/drivers/media/radio/Makefile
+++ b/drivers/media/radio/Makefile
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
--- a/drivers/media/video/compat_ioctl32.c
+++ b/drivers/media/video/compat_ioctl32.c
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
--- a/drivers/media/video/pwc/Kconfig
+++ b/drivers/media/video/pwc/Kconfig
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
--- a/drivers/media/video/tuner-types.c
+++ b/drivers/media/video/tuner-types.c
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
--- a/drivers/mmc/mmc_queue.c
+++ b/drivers/mmc/mmc_queue.c
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
--- a/drivers/scsi/arm/Kconfig
+++ b/drivers/scsi/arm/Kconfig
--- a/drivers/scsi/arm/scsi.h
+++ b/drivers/scsi/arm/scsi.h
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
--- a/drivers/usb/input/appletouch.c
+++ b/drivers/usb/input/appletouch.c
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
--- a/drivers/video/imacfb.c
+++ b/drivers/video/imacfb.c
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
--- a/fs/jfs/jfs_inode.h
+++ b/fs/jfs/jfs_inode.h
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
--- a/fs/locks.c
+++ b/fs/locks.c
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
--- a/fs/ocfs2/dlm/dlmunlock.c
+++ b/fs/ocfs2/dlm/dlmunlock.c
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
--- a/fs/ocfs2/suballoc.h
+++ b/fs/ocfs2/suballoc.h
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
--- a/fs/xfs/xfs_alloc.c
+++ b/fs/xfs/xfs_alloc.c
--- a/include/asm-powerpc/kexec.h
+++ b/include/asm-powerpc/kexec.h
--- a/Show more
+++ b/Show more