u-boot/board/woodburn
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
..
imximage.cfg MX35: add support for woodburn board 2012-10-26 16:27:59 +02:00
lowlevel_init.S MX35: add support for woodburn board 2012-10-26 16:27:59 +02:00
Makefile MX35: add support for woodburn board 2012-10-26 16:27:59 +02:00
woodburn.c Merge branch 'master' of git://git.denx.de/u-boot into master 2012-12-08 12:02:45 +01:00