git.librecmc.org Git - oweals/u-boot.git/commit

author	Stefano Babic <sbabic@denx.de>
	Wed, 31 Jul 2013 09:30:38 +0000 (11:30 +0200)
committer	Stefano Babic <sbabic@denx.de>
	Wed, 31 Jul 2013 09:30:38 +0000 (11:30 +0200)
commit	326ea986ac150acdc7656d57fca647db80b50158
tree	15724288b8b6da3a98d934db8330bb964cdfdf36	tree \| snapshot
parent	4acb4d391f005c0c72f7b84041b3884e4260a5a4	commit \| diff
parent	fdce7b633a1de24456226b18527cc7900c34282a	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/mx6/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/mx6/soc.c	diff1 \|	diff2 \|	blob \| history
arch/arm/imx-common/cmd_hdmidet.c	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch-mx6/clock.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch-mx6/mxc_hdmi.h	diff1 \|	diff2 \|	blob \| history
board/boundary/nitrogen6x/nitrogen6x.c	diff1 \|	diff2 \|	blob \| history
board/freescale/mx6sabresd/mx6sabresd.c	diff1 \|	diff2 \|	blob \| history
board/wandboard/wandboard.c	diff1 \|	diff2 \|	blob \| history
boards.cfg	diff1 \|	diff2 \|	blob \| history
drivers/gpio/mxc_gpio.c	diff1 \|	diff2 \|	blob \| history
drivers/video/mxc_ipuv3_fb.c	diff1 \|	diff2 \|	blob \| history
include/configs/apx4devkit.h	diff1 \|	diff2 \|	blob \| history
include/configs/m28evk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx23_olinuxino.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx23evk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx28evk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx6sabre_common.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx6sabresd.h	diff1 \|	diff2 \|	blob \| history
include/configs/nitrogen6x.h	diff1 \|	diff2 \|	blob \| history
include/configs/sc_sps_1.h	diff1 \|	diff2 \|	blob \| history
include/configs/wandboard.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

README	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/mx6/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/mx6/soc.c	diff1 \|	diff2 \|	blob \| history
arch/arm/imx-common/cmd_hdmidet.c	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch-mx6/clock.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch-mx6/mxc_hdmi.h	diff1 \|	diff2 \|	blob \| history
board/boundary/nitrogen6x/nitrogen6x.c	diff1 \|	diff2 \|	blob \| history
board/freescale/mx6sabresd/mx6sabresd.c	diff1 \|	diff2 \|	blob \| history
board/wandboard/wandboard.c	diff1 \|	diff2 \|	blob \| history
boards.cfg	diff1 \|	diff2 \|	blob \| history
drivers/gpio/mxc_gpio.c	diff1 \|	diff2 \|	blob \| history
drivers/video/mxc_ipuv3_fb.c	diff1 \|	diff2 \|	blob \| history
include/configs/apx4devkit.h	diff1 \|	diff2 \|	blob \| history
include/configs/m28evk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx23_olinuxino.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx23evk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx28evk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx6sabre_common.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx6sabresd.h	diff1 \|	diff2 \|	blob \| history
include/configs/nitrogen6x.h	diff1 \|	diff2 \|	blob \| history
include/configs/sc_sps_1.h	diff1 \|	diff2 \|	blob \| history
include/configs/wandboard.h	diff1 \|	diff2 \|	blob \| history