Merge branch 'mvebu/config' into mvebu/for-next
authorGregory CLEMENT <gregory.clement@free-electrons.com>
Mon, 2 Nov 2015 20:53:33 +0000 (21:53 +0100)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Mon, 2 Nov 2015 20:53:33 +0000 (21:53 +0100)

Trivial merge