Merge branch 'master' of...

Documentation/DMA-API.txt

Documentation/cpu-freq/user-guide.txt

Documentation/filesystems/ocfs2.txt

Documentation/filesystems/proc.txt

Documentation/filesystems/ramfs-rootfs-initramfs.txt

Documentation/input/input-programming.txt

Documentation/local_ops.txt

Documentation/sound/alsa/ALSA-Configuration.txt

Documentation/spi/spi-summary

Documentation/tracers/mmiotrace.txt

MAINTAINERS

Makefile

arch/Kconfig

arch/alpha/kernel/pci.c

arch/alpha/kernel/smp.c

arch/alpha/kernel/traps.c

arch/arm/configs/corgi_defconfig

arch/arm/mach-pxa/mioa701.c

arch/arm/mach-pxa/mioa701_bootresume.S

arch/arm/mach-pxa/palmtx.c