Merge branch 'master' into upstream

Documentation/memory-barriers.txt

arch/alpha/Kconfig

arch/arm/mach-ep93xx/ts72xx.c

arch/arm/mach-imx/irq.c

arch/arm/mach-integrator/integrator_cp.c

arch/arm/mach-pxa/spitz.c

arch/arm/mach-sa1100/neponset.c

arch/arm/mach-versatile/core.c

arch/i386/kernel/acpi/earlyquirk.c

arch/i386/kernel/setup.c

arch/powerpc/kernel/prom_init.c

arch/powerpc/kernel/signal_32.c

arch/powerpc/kernel/signal_64.c

arch/powerpc/platforms/cell/setup.c

arch/powerpc/platforms/pseries/setup.c

arch/sparc/kernel/smp.c

arch/sparc64/kernel/pci_sun4v.c

arch/sparc64/kernel/smp.c

arch/sparc64/kernel/sparc64_ksyms.c

arch/sparc64/kernel/traps.c