tree 67028131161fdded15fd8625aabf3de03cc98b00
parent 4c48cfb58b66924c52cd5c5d960e04cf6d7064ca
parent 91d7746df89f858548fe535137b4b185a6a76d59
author Tom Rini <trini@ti.com> 1393350253 -0500
committer Tom Rini <trini@ti.com> 1393354549 -0500

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

With this, fixup a trivial build error of get_effective_memsize needing
to be updated in the new board/freescale/p1010rdb/spl.c

Signed-off-by: Tom Rini <trini@ti.com>