Merge git://git.denx.de/u-boot-arm
authorStefano Babic <sbabic@denx.de>
Wed, 31 Jul 2013 09:30:38 +0000 (11:30 +0200)
committerStefano Babic <sbabic@denx.de>
Wed, 31 Jul 2013 09:30:38 +0000 (11:30 +0200)
commit326ea986ac150acdc7656d57fca647db80b50158
tree15724288b8b6da3a98d934db8330bb964cdfdf36
parent4acb4d391f005c0c72f7b84041b3884e4260a5a4
parentfdce7b633a1de24456226b18527cc7900c34282a
Merge git://git.denx.de/u-boot-arm

Conflicts:
board/freescale/mx6qsabrelite/Makefile
board/freescale/mx6qsabrelite/mx6qsabrelite.c
include/configs/mx6qsabrelite.h

Signed-off-by: Stefano Babic <sbabic@denx.de>
22 files changed:
README
arch/arm/cpu/armv7/mx6/clock.c
arch/arm/cpu/armv7/mx6/soc.c
arch/arm/imx-common/cmd_hdmidet.c
arch/arm/include/asm/arch-mx6/clock.h
arch/arm/include/asm/arch-mx6/mxc_hdmi.h
board/boundary/nitrogen6x/nitrogen6x.c
board/freescale/mx6sabresd/mx6sabresd.c
board/wandboard/wandboard.c
boards.cfg
drivers/gpio/mxc_gpio.c
drivers/video/mxc_ipuv3_fb.c
include/configs/apx4devkit.h
include/configs/m28evk.h
include/configs/mx23_olinuxino.h
include/configs/mx23evk.h
include/configs/mx28evk.h
include/configs/mx6sabre_common.h
include/configs/mx6sabresd.h
include/configs/nitrogen6x.h
include/configs/sc_sps_1.h
include/configs/wandboard.h