tree 5d5e468bee175a0ef1403e07df7bb09f08dba2db
parent 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd
parent 35d35aae817706800a4913711d563a99e1dc380a
author Nicolas Ferre <nicolas.ferre@atmel.com> 1400772967 +0200
committer Nicolas Ferre <nicolas.ferre@atmel.com> 1400772967 +0200

Merge branch 'at91-3.15-fixes' into at91-3.16-dt3