]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'at91-4.1-multiplatform' into at91-next
authorNicolas Ferre <nicolas.ferre@atmel.com>
Thu, 19 Mar 2015 15:40:29 +0000 (16:40 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Thu, 19 Mar 2015 15:40:29 +0000 (16:40 +0100)

Trivial merge