Merge branch 'at91-3.19-fixes' into at91-3.20-soc
authorNicolas Ferre <nicolas.ferre@atmel.com>
Mon, 2 Feb 2015 09:58:59 +0000 (10:58 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Mon, 2 Feb 2015 09:58:59 +0000 (10:58 +0100)

Trivial merge