Merge branch 'master' of git+ssh://git.kernelconcepts.de/karo-tx-redboot master
authorLothar Waßmann <LW@KARO-electronics.de>
Thu, 11 Feb 2016 15:57:33 +0000 (16:57 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 11 Feb 2016 15:57:33 +0000 (16:57 +0100)

Trivial merge