Merge remote-tracking branch 'remotes/tx6/tx6' into karo-tx-uboot
authorLothar Waßmann <LW@KARO-electronics.de>
Fri, 21 Aug 2015 14:51:29 +0000 (16:51 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 21 Aug 2015 14:51:29 +0000 (16:51 +0200)

Trivial merge