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

arch/arm/cpu/arm1136/mx31/generic.c

arch/arm/include/asm/arch-mx31/mx31-regs.h

board/davedenx/qong/Makefile

board/davedenx/qong/fpga.c

board/davedenx/qong/qong.c

board/davedenx/qong/qong_fpga.h

board/freescale/mx51evk/config.mk

drivers/fpga/Makefile

drivers/fpga/fpga.c

drivers/fpga/ivm_core.c

drivers/fpga/lattice.c

drivers/usb/host/Makefile

drivers/usb/host/ehci-mxc.c

drivers/video/mx3fb.c

include/configs/qong.h

include/fpga.h

include/lattice.h