Merge commit 'origin/master' into next

Manual merge of: arch/powerpc/include/asm/pgtable-ppc32.h
2026-09-26 18:16:26 +00:00 · 2009-02-18 13:19:25 +11:00 · 2009-02-18 13:19:25 +11:00 · 82a0a1cc8f
commit 82a0a1cc8f
parent 8d30c14cab 5955c7a2cf
233 changed files with 10703 additions and 10001 deletions
--- a/Documentation/PCI/PCIEBUS-HOWTO.txt
+++ b/Documentation/PCI/PCIEBUS-HOWTO.txt
--- a/Documentation/connector/cn_test.c
+++ b/Documentation/connector/cn_test.c
--- a/Documentation/kernel-doc-nano-HOWTO.txt
+++ b/Documentation/kernel-doc-nano-HOWTO.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/tracers/mmiotrace.txt
+++ b/Documentation/tracers/mmiotrace.txt
--- a/26
+++ b/26
--- a/4
+++ b/4
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
--- a/arch/arm/mach-pxa/dma.c
+++ b/arch/arm/mach-pxa/dma.c
--- a/arch/arm/mach-pxa/include/mach/regs-ac97.h
+++ b/arch/arm/mach-pxa/include/mach/regs-ac97.h
--- a/arch/arm/mach-pxa/include/mach/regs-ssp.h
+++ b/arch/arm/mach-pxa/include/mach/regs-ssp.h
--- a/arch/arm/mach-pxa/pxa300.c
+++ b/arch/arm/mach-pxa/pxa300.c
--- a/arch/arm/mach-pxa/pxa320.c
+++ b/arch/arm/mach-pxa/pxa320.c
--- a/arch/ia64/include/asm/kvm.h
+++ b/arch/ia64/include/asm/kvm.h
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
--- a/arch/ia64/kvm/process.c
+++ b/arch/ia64/kvm/process.c
--- a/arch/powerpc/include/asm/pgtable-4k.h
+++ b/arch/powerpc/include/asm/pgtable-4k.h
--- a/arch/powerpc/include/asm/pgtable-64k.h
+++ b/arch/powerpc/include/asm/pgtable-64k.h
--- a/arch/powerpc/include/asm/pgtable-ppc32.h
+++ b/arch/powerpc/include/asm/pgtable-ppc32.h
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
--- a/arch/powerpc/mm/hash_low_32.S
+++ b/arch/powerpc/mm/hash_low_32.S
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
--- a/arch/x86/include/asm/a.out-core.h
+++ b/arch/x86/include/asm/a.out-core.h
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
--- a/arch/x86/include/asm/kvm.h
+++ b/arch/x86/include/asm/kvm.h
--- a/arch/x86/include/asm/math_emu.h
+++ b/arch/x86/include/asm/math_emu.h
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
--- a/arch/x86/include/asm/page.h
+++ b/arch/x86/include/asm/page.h
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
--- a/arch/x86/include/asm/traps.h
+++ b/arch/x86/include/asm/traps.h
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
--- a/arch/x86/kernel/i8237.c
+++ b/arch/x86/kernel/i8237.c
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
--- a/arch/x86/kernel/olpc.c
+++ b/arch/x86/kernel/olpc.c
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
--- a/arch/x86/kvm/irq.c
+++ b/arch/x86/kvm/irq.c
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
--- a/arch/x86/math-emu/fpu_entry.c
+++ b/arch/x86/math-emu/fpu_entry.c
--- a/arch/x86/math-emu/fpu_proto.h
+++ b/arch/x86/math-emu/fpu_proto.h
--- a/arch/x86/math-emu/fpu_system.h
+++ b/arch/x86/math-emu/fpu_system.h
--- a/arch/x86/math-emu/get_address.c
+++ b/arch/x86/math-emu/get_address.c
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
--- a/crypto/lrw.c
+++ b/crypto/lrw.c
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
--- a/drivers/hwmon/f71882fg.c
+++ b/drivers/hwmon/f71882fg.c
--- a/drivers/hwmon/vt1211.c
+++ b/drivers/hwmon/vt1211.c
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
--- a/drivers/mfd/htc-egpio.c
+++ b/drivers/mfd/htc-egpio.c
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
--- a/drivers/mfd/wm8350-regmap.c
+++ b/drivers/mfd/wm8350-regmap.c
--- a/Show more
+++ b/Show more