uboot/nand_spl/board/freescale
Stefano Babic 05a860c228 Merge branch 'master' of git://git.denx.de/u-boot into master
Conflicts:
	drivers/power/power_fsl.c
	include/configs/mx35pdk.h
	include/configs/mx53loco.h
	include/configs/woodburn_common.h
	board/woodburn/woodburn.c

These boards still use the old old PMIC framework, so they
do not merge properly after the power framework was merged into
mainline.

Fix all conflicts and update woodburn to use Power Framework.

Signed-off-by: Stefano Babic <sbabic@denx.de>
2012-12-08 12:02:45 +01:00
..
mpc8313erdb
mpc8315erdb
mpc8536ds spl/mpc85xx: rename cpu_init_nand.c to spl_minimal.c 2012-11-26 15:41:24 -06:00
mpc8569mds spl/mpc85xx: rename cpu_init_nand.c to spl_minimal.c 2012-11-26 15:41:24 -06:00
mpc8572ds spl/mpc85xx: rename cpu_init_nand.c to spl_minimal.c 2012-11-26 15:41:24 -06:00
mx31pdk Merge branch 'master' of git://git.denx.de/u-boot into master 2012-12-08 12:02:45 +01:00
p1_p2_rdb spl/mpc85xx: rename cpu_init_nand.c to spl_minimal.c 2012-11-26 15:41:24 -06:00
p1010rdb 8xxx: Change all 8*xx_DDR addresses to 8xxx 2012-11-27 17:45:17 -06:00
p1023rds 8xxx: Change all 8*xx_DDR addresses to 8xxx 2012-11-27 17:45:17 -06:00