Merge remote-tracking branch 'u-boot/master'
authorAlbert ARIBAUD <[email protected]>
Wed, 14 Oct 2015 08:46:36 +0000 (10:46 +0200)
committerAlbert ARIBAUD <[email protected]>
Wed, 14 Oct 2015 08:46:36 +0000 (10:46 +0200)

Trivial merge