]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 19 Feb 2014 06:15:01 +0000 (07:15 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 19 Feb 2014 06:15:01 +0000 (07:15 +0100)
1  2 
MAKEALL
README
boards.cfg
drivers/serial/Makefile
drivers/serial/serial.c

diff --cc MAKEALL
Simple merge
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
Simple merge
Simple merge