Merge ../powerpc-merge

Documentation/filesystems/ntfs.txt

Documentation/filesystems/tmpfs.txt

Documentation/x86_64/boot-options.txt

Makefile

arch/arm/mach-at91rm9200/gpio.c

arch/i386/Kconfig

arch/i386/kernel/Makefile

arch/i386/kernel/cpu/common.c

arch/i386/kernel/efi.c

arch/i386/kernel/head.S

arch/i386/kernel/i386_ksyms.c

arch/i386/kernel/io_apic.c

arch/i386/kernel/kprobes.c

arch/i386/kernel/mpparse.c

arch/i386/kernel/smpboot.c

arch/i386/kernel/topology.c

arch/i386/mach-default/Makefile

arch/i386/mach-voyager/voyager_basic.c

arch/i386/mach-voyager/voyager_smp.c

arch/ia64/Kconfig