arch/arm/Kconfig · daa483debea9596f23f5869f7623cec1ef761718 · Jack Humbert / reform-boundary-uboot

Forked from Reform / reform-boundary-uboot

Source project has a limited visibility.

8 years ago

Merge branch 'master' of git://www.denx.de/git/u-boot-imx · 02ccab19

Tom Rini authored 8 years ago


Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
	configs/bk4r1_defconfig
	configs/colibri_vf_defconfig
	configs/pcm052_defconfig
	include/configs/colibri_vf.h
	include/configs/pcm052.h

02ccab19

History

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

Tom Rini authored 8 years ago


Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
	configs/bk4r1_defconfig
	configs/colibri_vf_defconfig
	configs/pcm052_defconfig
	include/configs/colibri_vf.h
	include/configs/pcm052.h