tree 764536da9202b9de387a0d957829f64dfba818b7
parent 393ff47ba3123208f7c4f08d63f114300a41d0c4
parent fd4d564b3c80b111f18c93adb14233a6a7ddb0e9
author Stefano Babic <sbabic@denx.de> 1354964565 +0100
committer Stefano Babic <sbabic@denx.de> 1354964565 +0100

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>