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

Trivial merge