]> git.sur5r.net Git - u-boot/commitdiff
Merge 'u-boot-atmel/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 9 Jan 2013 19:01:48 +0000 (20:01 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 9 Jan 2013 19:01:48 +0000 (20:01 +0100)
1  2 
include/configs/at91sam9x5ek.h

Simple merge