Merge branch 'tx48-devel' into karo-devel
authorLothar Waßmann <LW@KARO-electronics.de>
Mon, 26 Oct 2015 13:46:20 +0000 (14:46 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Mon, 26 Oct 2015 13:46:20 +0000 (14:46 +0100)

Trivial merge