Merge branch 'spi/merge' into spi/next

CREDITS

Documentation/kernel-parameters.txt

MAINTAINERS

Makefile

arch/arm/mach-ep93xx/core.c

arch/arm/mach-exynos4/Kconfig

arch/arm/mach-exynos4/Makefile

arch/arm/mach-exynos4/cpu.c

arch/arm/mach-exynos4/include/mach/regs-usb-phy.h

arch/arm/mach-exynos4/setup-usb-phy.c

arch/arm/mach-exynos4/time.c

arch/arm/mach-omap1/dma.c

arch/arm/mach-omap2/board-2430sdp.c

arch/arm/mach-omap2/board-3430sdp.c

arch/arm/mach-omap2/board-4430sdp.c

arch/arm/mach-omap2/board-apollon.c

arch/arm/mach-omap2/board-cm-t35.c

arch/arm/mach-omap2/board-cm-t3517.c

arch/arm/mach-omap2/board-devkit8000.c

arch/arm/mach-omap2/board-omap3beagle.c