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

MAKEALL

Makefile

board/apollon/Makefile

board/apollon/apollon.c

board/apollon/config.mk

board/apollon/lowlevel_init.S

board/apollon/mem.c

board/apollon/mem.h

board/apollon/sys_info.c

board/apollon/u-boot.lds

common/env_onenand.c

include/asm-arm/arch-arm1136/mux.h

include/asm-arm/arch-arm1136/omap2420.h

include/asm-arm/mach-types.h

include/configs/apollon.h