Merge branch 'at91-3.15-fixes' into at91-3.16-dt3
authorNicolas Ferre <nicolas.ferre@atmel.com>
Thu, 22 May 2014 15:36:07 +0000 (17:36 +0200)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Thu, 22 May 2014 15:36:07 +0000 (17:36 +0200)

Trivial merge