]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 24 Jun 2014 17:54:20 +0000 (19:54 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 24 Jun 2014 17:54:20 +0000 (19:54 +0200)

Trivial merge