Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

author Tom Rini <trini@ti.com>

Wed, 9 Oct 2013 14:06:40 +0000 (10:06 -0400)

committer Tom Rini <trini@ti.com>

Wed, 9 Oct 2013 14:06:40 +0000 (10:06 -0400)
author Tom Rini <trini@ti.com>
Wed, 9 Oct 2013 14:06:40 +0000 (10:06 -0400)
committer Tom Rini <trini@ti.com>
Wed, 9 Oct 2013 14:06:40 +0000 (10:06 -0400)
diff --cc board/keymile/common/common.c
Simple merge
diff --cc board/keymile/common/ivm.c
Simple merge
diff --cc board/keymile/km83xx/km83xx.c
Simple merge
author	Tom Rini <trini@ti.com>
	Wed, 9 Oct 2013 14:06:40 +0000 (10:06 -0400)
committer	Tom Rini <trini@ti.com>
	Wed, 9 Oct 2013 14:06:40 +0000 (10:06 -0400)
		1	2
board/keymile/common/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
board/keymile/common/ivm.c	patch \|	diff1 \|	diff2 \|	blob \| history
board/keymile/km83xx/km83xx.c	patch \|	diff1 \|	diff2 \|	blob \| history