Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Tue, 25 Feb 2014 17:44:13 +0000 (12:44 -0500)
committerTom Rini <trini@ti.com>
Tue, 25 Feb 2014 18:55:49 +0000 (13:55 -0500)
commita7e8c15f71456d55ccb27f843862af03a00e0957
tree67028131161fdded15fd8625aabf3de03cc98b00
parent4c48cfb58b66924c52cd5c5d960e04cf6d7064ca
parent91d7746df89f858548fe535137b4b185a6a76d59
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>
board/freescale/p1010rdb/spl.c
boards.cfg
drivers/net/phy/atheros.c
include/configs/MPC8536DS.h
include/configs/T208xQDS.h