Merge branches 'at91-3.18-cleanup' and 'at91-3.18-dt' into at91-3.18-drivers
authorNicolas Ferre <nicolas.ferre@atmel.com>
Mon, 25 Aug 2014 13:33:23 +0000 (15:33 +0200)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Mon, 25 Aug 2014 13:33:23 +0000 (15:33 +0200)

Trivial merge