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
..
.gitignore	common: Add symbol handling for generic lists into Makefile	2012-10-22 08:29:29 -07:00
Makefile	Merge branch 'master' of git://git.denx.de/u-boot into master	2012-12-08 12:02:45 +01:00