Merge branch 'tx48-devel' into uboot-merge
authorLothar Waßmann <LW@KARO-electronics.de>
Wed, 5 Mar 2014 14:37:19 +0000 (15:37 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 5 Mar 2014 14:37:19 +0000 (15:37 +0100)

Trivial merge