Merge branch 'master'

2026-09-18 18:15:59 +00:00 · 2006-04-27 11:49:55 -04:00 · 2006-04-27 11:49:55 -04:00 · d26046bb0a
commit d26046bb0a
parent e7f5c01cad 2be4d50295
167 changed files with 3835 additions and 1691 deletions
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
--- a/12
+++ b/12
--- a/2
+++ b/2
--- a/arch/alpha/lib/strncpy.S
+++ b/arch/alpha/lib/strncpy.S
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
--- a/arch/arm/kernel/head-nommu.S
+++ b/arch/arm/kernel/head-nommu.S
--- a/arch/arm/vfp/vfpdouble.c
+++ b/arch/arm/vfp/vfpdouble.c
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
--- a/arch/arm/vfp/vfpsingle.c
+++ b/arch/arm/vfp/vfpsingle.c
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/arch/i386/kernel/cpu/intel_cacheinfo.c
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
--- a/arch/parisc/defconfig
+++ b/arch/parisc/defconfig
--- a/arch/parisc/kernel/asm-offsets.c
+++ b/arch/parisc/kernel/asm-offsets.c
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
--- a/arch/parisc/kernel/init_task.c
+++ b/arch/parisc/kernel/init_task.c
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
--- a/arch/parisc/mm/ioremap.c
+++ b/arch/parisc/mm/ioremap.c
--- 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/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
--- a/arch/powerpc/kernel/pci_iommu.c
+++ b/arch/powerpc/kernel/pci_iommu.c
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
--- a/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.S
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
--- a/arch/powerpc/platforms/cell/spu_callbacks.c
+++ b/arch/powerpc/platforms/cell/spu_callbacks.c
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
--- a/arch/ppc/kernel/asm-offsets.c
+++ b/arch/ppc/kernel/asm-offsets.c
--- a/arch/ppc/kernel/entry.S
+++ b/arch/ppc/kernel/entry.S
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
--- a/arch/x86_64/ia32/Makefile
+++ b/arch/x86_64/ia32/Makefile
--- a/arch/x86_64/kernel/mce.c
+++ b/arch/x86_64/kernel/mce.c
--- a/arch/x86_64/kernel/mce_amd.c
+++ b/arch/x86_64/kernel/mce_amd.c
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
--- a/drivers/char/drm/drm_agpsupport.c
+++ b/drivers/char/drm/drm_agpsupport.c
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/char/drm/drm_stub.c
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/char/drm/r300_cmdbuf.c
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
--- a/drivers/char/tpm/Makefile
+++ b/drivers/char/tpm/Makefile
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
--- a/drivers/char/tpm/tpm_atmel.h
+++ b/drivers/char/tpm/tpm_atmel.h
--- a/drivers/char/tpm/tpm_bios.c
+++ b/drivers/char/tpm/tpm_bios.c
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
--- a/drivers/char/tpm/tpm_nsc.c
+++ b/drivers/char/tpm/tpm_nsc.c
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
--- a/drivers/isdn/gigaset/ev-layer.c
+++ b/drivers/isdn/gigaset/ev-layer.c
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
--- a/drivers/isdn/gigaset/isocdata.c
+++ b/drivers/isdn/gigaset/isocdata.c
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/gianfar_ethtool.c
--- a/drivers/net/gianfar_sysfs.c
+++ b/drivers/net/gianfar_sysfs.c
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
--- a/drivers/net/wireless/bcm43xx/bcm43xx_pio.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_pio.c
--- a/drivers/net/wireless/bcm43xx/bcm43xx_pio.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_pio.h
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
--- a/Show more
+++ b/Show more