Merge branch 'karo-tx-uboot' into kc-merge
authorLothar Waßmann <LW@KARO-electronics.de>
Mon, 24 Aug 2015 11:45:51 +0000 (13:45 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Mon, 24 Aug 2015 11:45:51 +0000 (13:45 +0200)
commit3d5920a31bb846249385e1ca5c086662c39bc44e
treeb902a8580875df2c6d329cb55a2f3768c7e50dcd
parent71441b628c8258d5681b43929b99e9c3110f09ae
parente5bfa321e40ee65bbcfee24f6b9456609ed6ba83
Merge branch 'karo-tx-uboot' into kc-merge

Conflicts:
board/karo/common/mmc.c
board/karo/tx6/Makefile
board/karo/tx6/pmic.c
board/karo/tx6/pmic.h
board/karo/tx6/tx6qdl.c
boards.cfg
include/configs/tx6.h
board/karo/tx51/tx51.c
include/configs/tx6.h