Merge branch 'master' of git://git.denx.de/u-boot-arm

arch/arm/cpu/arm926ejs/orion5x/cpu.c

arch/arm/cpu/armv7/mx51/timer.c

arch/arm/cpu/armv7/omap-common/timer.c

arch/arm/cpu/armv7/omap4/Makefile

arch/arm/cpu/armv7/omap4/board.c

arch/arm/cpu/armv7/omap4/mem.c

arch/arm/include/asm/arch-kirkwood/kirkwood.h

arch/arm/include/asm/arch-omap3/cpu.h

arch/arm/include/asm/arch-omap3/i2c.h

arch/arm/include/asm/arch-omap4/cpu.h

arch/arm/include/asm/arch-omap4/mux_omap4.h

arch/arm/include/asm/arch-omap4/omap4.h

arch/arm/include/asm/arch-omap4/sys_proto.h

arch/arm/include/asm/arch-orion5x/cpu.h

arch/arm/include/asm/arch-orion5x/orion5x.h

arch/arm/include/asm/arch-s5pc1xx/cpu.h

arch/arm/include/asm/arch-s5pc1xx/mmc.h

arch/arm/include/asm/io.h

arch/powerpc/include/asm/config.h

board/davinci/da8xxevm/da830evm.c