Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'

author Albert ARIBAUD <albert.u.boot@aribaud.net>

Wed, 19 Feb 2014 06:15:01 +0000 (07:15 +0100)

committer Albert ARIBAUD <albert.u.boot@aribaud.net>

Wed, 19 Feb 2014 06:15:01 +0000 (07:15 +0100)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 19 Feb 2014 06:15:01 +0000 (07:15 +0100)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 19 Feb 2014 06:15:01 +0000 (07:15 +0100)
diff --cc MAKEALL
Simple merge
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc drivers/serial/Makefile
Simple merge
diff --cc drivers/serial/serial.c
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Wed, 19 Feb 2014 06:15:01 +0000 (07:15 +0100)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Wed, 19 Feb 2014 06:15:01 +0000 (07:15 +0100)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/serial/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/serial/serial.c	patch \|	diff1 \|	diff2 \|	blob \| history