Merge tag 'KARO-TX6-2015-03-24' into uboot-merge
authorLothar Waßmann <LW@KARO-electronics.de>
Fri, 6 May 2016 12:33:39 +0000 (14:33 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 6 May 2016 12:33:39 +0000 (14:33 +0200)

Trivial merge