Merge branch 'master'

2026-09-14 18:22:56 +00:00 · 2005-11-16 20:45:40 -05:00 · 2005-11-16 20:45:40 -05:00 · 8b200abdcf
commit 8b200abdcf
parent 7bdd720869 0db169f970
67 changed files with 2986 additions and 2535 deletions
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
--- a/arch/powerpc/boot/README
+++ b/arch/powerpc/boot/README
--- a/arch/powerpc/boot/addRamDisk.c
+++ b/arch/powerpc/boot/addRamDisk.c
--- a/arch/powerpc/boot/addnote.c
+++ b/arch/powerpc/boot/addnote.c
--- a/arch/powerpc/boot/crt0.S
+++ b/arch/powerpc/boot/crt0.S
--- a/arch/powerpc/boot/div64.S
+++ b/arch/powerpc/boot/div64.S
--- a/arch/powerpc/boot/elf.h
+++ b/arch/powerpc/boot/elf.h
--- a/arch/powerpc/boot/install.sh
+++ b/arch/powerpc/boot/install.sh
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
--- a/arch/powerpc/boot/page.h
+++ b/arch/powerpc/boot/page.h
--- a/arch/powerpc/boot/ppc_asm.h
+++ b/arch/powerpc/boot/ppc_asm.h
--- a/arch/powerpc/boot/prom.c
+++ b/arch/powerpc/boot/prom.c
--- a/arch/powerpc/boot/prom.h
+++ b/arch/powerpc/boot/prom.h
--- a/arch/powerpc/boot/stdio.h
+++ b/arch/powerpc/boot/stdio.h
--- a/arch/powerpc/boot/string.S
+++ b/arch/powerpc/boot/string.S
--- a/arch/powerpc/boot/string.h
+++ b/arch/powerpc/boot/string.h
--- a/arch/powerpc/boot/zImage.lds
+++ b/arch/powerpc/boot/zImage.lds
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
--- 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/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
--- a/arch/powerpc/kernel/vdso32/cacheflush.S
+++ b/arch/powerpc/kernel/vdso32/cacheflush.S
--- a/arch/powerpc/kernel/vdso32/datapage.S
+++ b/arch/powerpc/kernel/vdso32/datapage.S
--- a/arch/powerpc/kernel/vdso32/gettimeofday.S
+++ b/arch/powerpc/kernel/vdso32/gettimeofday.S
--- a/arch/powerpc/kernel/vdso64/cacheflush.S
+++ b/arch/powerpc/kernel/vdso64/cacheflush.S
--- a/arch/powerpc/kernel/vdso64/datapage.S
+++ b/arch/powerpc/kernel/vdso64/datapage.S
--- a/arch/powerpc/kernel/vdso64/gettimeofday.S
+++ b/arch/powerpc/kernel/vdso64/gettimeofday.S
--- a/arch/powerpc/mm/lmb.c
+++ b/arch/powerpc/mm/lmb.c
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
--- a/arch/ppc/xmon/start.c
+++ b/arch/ppc/xmon/start.c
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
--- a/include/asm-powerpc/ppc-pci.h
+++ b/include/asm-powerpc/ppc-pci.h
--- a/include/asm-powerpc/vdso.h
+++ b/include/asm-powerpc/vdso.h
--- a/include/asm-ppc/pgalloc.h
+++ b/include/asm-ppc/pgalloc.h
--- a/include/asm-ppc64/pci-bridge.h
+++ b/include/asm-ppc64/pci-bridge.h
--- a/include/linux/compat_ioctl.h
+++ b/include/linux/compat_ioctl.h
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c